mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
Merge from server
Adding lots to .hgignore
This commit is contained in:
expo
commit
e04eaf89d1
445
.hgignore
Normal file
445
.hgignore
Normal file
@ -0,0 +1,445 @@
|
||||
syntax: glob
|
||||
*~
|
||||
*.3d
|
||||
*.tgz
|
||||
*.pos
|
||||
|
||||
indexal.htm
|
||||
report.html
|
||||
dplong.htm
|
||||
br-alm/index.html
|
||||
egglgrub/index.html
|
||||
gschwand/index.html
|
||||
kratzer/index.html
|
||||
plateau/index.html
|
||||
remote/index.html
|
||||
wilden/index.html
|
||||
smkridge/40area.html
|
||||
smkridge/41area.html
|
||||
smkridge/index.html
|
||||
smkridge/via161.html
|
||||
smkridge/via204.html
|
||||
smkridge/204/qm.html
|
||||
smkridge/234/qm.html
|
||||
smkridge/258/qm.html
|
||||
smkridge/204/atoz.html
|
||||
folk/index.htm
|
||||
noinfo/all.pos
|
||||
noinfo/lengths.dat
|
||||
|
||||
bierbook-pics.pdf
|
||||
*.aux
|
||||
bierbook.log
|
||||
bierbook.pdf
|
||||
bierbook.toc
|
||||
missfont.log
|
||||
|
||||
|
||||
plateau/100.htm
|
||||
plateau/101/101.html
|
||||
plateau/102/102.html
|
||||
plateau/103/103.html
|
||||
plateau/104/104.html
|
||||
plateau/105/105.html
|
||||
plateau/107.htm
|
||||
plateau/108/108.html
|
||||
plateau/111.htm
|
||||
plateau/112.htm
|
||||
plateau/145/145.html
|
||||
plateau/148/148.html
|
||||
plateau/159/159.html
|
||||
plateau/160.htm
|
||||
plateau/164.htm
|
||||
plateau/171/171.html
|
||||
plateau/172.htm
|
||||
plateau/173.htm
|
||||
plateau/174/174.html
|
||||
plateau/175.htm
|
||||
plateau/176.htm
|
||||
plateau/177.htm
|
||||
plateau/178.htm
|
||||
plateau/179.htm
|
||||
plateau/181.htm
|
||||
plateau/182/182.html
|
||||
plateau/183.htm
|
||||
plateau/184.htm
|
||||
plateau/188/188.html
|
||||
plateau/189.htm
|
||||
plateau/190/190.html
|
||||
plateau/197.htm
|
||||
plateau/198/198.html
|
||||
plateau/1987_02.html
|
||||
plateau/1992-X01.html
|
||||
plateau/1996-X01/1996-X01.html
|
||||
plateau/1996_05.html
|
||||
plateau/1998-X01.html
|
||||
plateau/1999-OB-01/1999-OB-01.html
|
||||
plateau/1999-OB-02/1999-OB-02.html
|
||||
plateau/200.htm
|
||||
plateau/2004-01/2004-01.html
|
||||
plateau/2004-02/2004-02.html
|
||||
plateau/2004-03/2004-03.html
|
||||
plateau/2004-04.html
|
||||
plateau/2004-05/2004-05.html
|
||||
plateau/2004-06/2004-06.html
|
||||
plateau/2004-07/2004-07.html
|
||||
plateau/2004-08/2004-08.html
|
||||
plateau/2004-09.html
|
||||
plateau/2005-91/2005-91.html
|
||||
plateau/2005-92/2005-92.html
|
||||
plateau/2005-93/2005-93.html
|
||||
plateau/2005-94/2005-94.html
|
||||
plateau/2005-95.html
|
||||
plateau/2005-96/2005-96.html
|
||||
plateau/2005-97/2005-97.html
|
||||
plateau/2005-98/2005-98.html
|
||||
plateau/2005-99/2005-99.html
|
||||
plateau/2006-70/2006-70.html
|
||||
plateau/2006-71/2006-71.html
|
||||
plateau/2006-73.html
|
||||
plateau/2007-70.html
|
||||
plateau/2007-71.html
|
||||
plateau/2007-72.html
|
||||
plateau/207/207.html
|
||||
plateau/208/208.html
|
||||
plateau/210.htm
|
||||
plateau/220/220.html
|
||||
plateau/226/226.html
|
||||
plateau/227/227.html
|
||||
plateau/250/250.html
|
||||
plateau/76/76.htm
|
||||
plateau/80/80.html
|
||||
plateau/81/81.html
|
||||
plateau/82.htm
|
||||
plateau/83.htm
|
||||
plateau/84.htm
|
||||
plateau/85/85.html
|
||||
plateau/86.htm
|
||||
plateau/89.htm
|
||||
plateau/90/90.html
|
||||
plateau/91/91.html
|
||||
plateau/92.htm
|
||||
plateau/93/93.html
|
||||
plateau/94/94.html
|
||||
plateau/97.htm
|
||||
plateau/98.htm
|
||||
plateau/99/99.html
|
||||
plateau/b10.htm
|
||||
plateau/b6.htm
|
||||
remote/110.htm
|
||||
remote/la25.htm
|
||||
remote/la26.htm
|
||||
remote/la27.htm
|
||||
remote/la30.htm
|
||||
remote/la35.htm
|
||||
remote/la37.htm
|
||||
remote/la38.htm
|
||||
remote/la40.htm
|
||||
smkridge/109.htm
|
||||
smkridge/113.htm
|
||||
smkridge/115.htm
|
||||
smkridge/135/135.html
|
||||
smkridge/137.htm
|
||||
smkridge/138.htm
|
||||
smkridge/139.htm
|
||||
smkridge/140.htm
|
||||
smkridge/141.htm
|
||||
smkridge/142.htm
|
||||
smkridge/143.htm
|
||||
smkridge/144.htm
|
||||
smkridge/146.htm
|
||||
smkridge/147.htm
|
||||
smkridge/149.htm
|
||||
smkridge/150.htm
|
||||
smkridge/151.htm
|
||||
smkridge/152.htm
|
||||
smkridge/153.htm
|
||||
smkridge/154.htm
|
||||
smkridge/155.htm
|
||||
smkridge/156/156.html
|
||||
smkridge/157/157.html
|
||||
smkridge/158.htm
|
||||
smkridge/161/136.htm
|
||||
smkridge/161/136a.htm
|
||||
smkridge/161/136b.htm
|
||||
smkridge/161/136c.htm
|
||||
smkridge/161/136d.htm
|
||||
smkridge/161/161a.htm
|
||||
smkridge/161/161b.htm
|
||||
smkridge/161/161c.htm
|
||||
smkridge/161/161d.htm
|
||||
smkridge/161/161e.htm
|
||||
smkridge/161/161f.htm
|
||||
smkridge/161/161g.htm
|
||||
smkridge/161/161h.htm
|
||||
smkridge/161/top.htm
|
||||
smkridge/162.htm
|
||||
smkridge/163/163.html
|
||||
smkridge/165.htm
|
||||
smkridge/180.htm
|
||||
smkridge/185/185.html
|
||||
smkridge/187.htm
|
||||
smkridge/191.htm
|
||||
smkridge/192.htm
|
||||
smkridge/193.htm
|
||||
smkridge/194.htm
|
||||
smkridge/195/195.html
|
||||
smkridge/196.htm
|
||||
smkridge/199.htm
|
||||
smkridge/1996_01.html
|
||||
smkridge/1996wk11.html
|
||||
smkridge/1996wk4.html
|
||||
smkridge/1997-07/1997-07.html
|
||||
smkridge/1999-X01.html
|
||||
smkridge/1999_ms_01.html
|
||||
smkridge/1999_ms_02.html
|
||||
smkridge/2000-02.html
|
||||
smkridge/2000-08/2000-08.htm
|
||||
smkridge/2001-02.html
|
||||
smkridge/2001-03.html
|
||||
smkridge/2001-06/2001-06.html
|
||||
smkridge/2001-07/2001-07.html
|
||||
smkridge/2001-08/2001-08.html
|
||||
smkridge/2001-09/2001-09.html
|
||||
smkridge/2001-10.html
|
||||
smkridge/2001-11.html
|
||||
smkridge/2001-12.html
|
||||
smkridge/2002-03.html
|
||||
smkridge/2002-05/2002-05.html
|
||||
smkridge/2002-06/2002-06.html
|
||||
smkridge/2002-07/2002-07.html
|
||||
smkridge/2002-08/2002-08.html
|
||||
smkridge/2002-10.html
|
||||
smkridge/2002-AD-01.html
|
||||
smkridge/2002-AD-02.html
|
||||
smkridge/2002-AD-03.html
|
||||
smkridge/2002-AD-04.html
|
||||
smkridge/2002-OB-01/2002-OB-01.html
|
||||
smkridge/2002-W-01/2002-W-01.html
|
||||
smkridge/2002-W-02.html
|
||||
smkridge/2002-X09.html
|
||||
smkridge/2002-X09B.html
|
||||
smkridge/2002-X15.html
|
||||
smkridge/2002-X16.html
|
||||
smkridge/2002-X17.html
|
||||
smkridge/2002-X18.html
|
||||
smkridge/2002-XX/2002-XX.html
|
||||
smkridge/2003-01/2003-01.html
|
||||
smkridge/2003-07/2003-07.html
|
||||
smkridge/2003-X11.html
|
||||
smkridge/2003-X12.html
|
||||
smkridge/2003-X13.html
|
||||
smkridge/2003-X14/2003-X14.html
|
||||
smkridge/2003-X15/2003-X15.html
|
||||
smkridge/2003-X16.html
|
||||
smkridge/2003-X17.html
|
||||
smkridge/2003-X18.html
|
||||
smkridge/2004-10/2004-10.html
|
||||
smkridge/2004-13.html
|
||||
smkridge/2004-14/2004-14.html
|
||||
smkridge/2004-15/2004-15.html
|
||||
smkridge/2004-16/2004-16.html
|
||||
smkridge/2004-17/2004-17.html
|
||||
smkridge/2004-18/2004-18.html
|
||||
smkridge/2004-19/2004-19.html
|
||||
smkridge/2004-20/2004-20.html
|
||||
smkridge/2004-21/2004-21.html
|
||||
smkridge/2005-01.html
|
||||
smkridge/2005-02.html
|
||||
smkridge/2005-03.html
|
||||
smkridge/2005-05/2005-05.html
|
||||
smkridge/2005-06/2005-06.html
|
||||
smkridge/2005-07/2005-07.html
|
||||
smkridge/2005-08/2005-08.html
|
||||
smkridge/2006-01/2006-01.html
|
||||
smkridge/2006-02/2006-02.html
|
||||
smkridge/2006-03/2006-03.html
|
||||
smkridge/2006-05.html
|
||||
smkridge/2006-06/2006-06.html
|
||||
smkridge/2006-07.html
|
||||
smkridge/2006-08/2006-08.html
|
||||
smkridge/2006-09/2006-09.html
|
||||
smkridge/201.htm
|
||||
smkridge/204/204.html
|
||||
smkridge/205/205.html
|
||||
smkridge/209/209.html
|
||||
smkridge/214/214.html
|
||||
smkridge/215/215.html
|
||||
smkridge/216.html
|
||||
smkridge/217/217.html
|
||||
smkridge/218.html
|
||||
smkridge/219.html
|
||||
smkridge/222.html
|
||||
smkridge/223.html
|
||||
smkridge/224.html
|
||||
smkridge/225/225.html
|
||||
smkridge/229/229.html
|
||||
smkridge/230/230.html
|
||||
smkridge/231/231.html
|
||||
smkridge/234/234.html
|
||||
smkridge/234/qm.html
|
||||
smkridge/235/235.html
|
||||
smkridge/236/236.html
|
||||
smkridge/237/237.html
|
||||
smkridge/238/238.html
|
||||
smkridge/239/239.html
|
||||
smkridge/240/240.html
|
||||
smkridge/241/241.html
|
||||
smkridge/242/242.html
|
||||
smkridge/243/243.html
|
||||
smkridge/244/244.html
|
||||
smkridge/245/245.html
|
||||
smkridge/246/246.html
|
||||
smkridge/247/247.html
|
||||
smkridge/248/248.html
|
||||
smkridge/249/249.html
|
||||
smkridge/251/251.html
|
||||
smkridge/258/258.html
|
||||
smkridge/40/40f.html
|
||||
smkridge/40/40s.html
|
||||
smkridge/41.htm
|
||||
smkridge/41b.htm
|
||||
smkridge/87.htm
|
||||
smkridge/87B.htm
|
||||
smkridge/88f.html
|
||||
smkridge/88h.html
|
||||
smkridge/hfg-ka88/hfg-ka88.html
|
||||
wilden/114.htm
|
||||
1626/la11.htm
|
||||
1626/la12.htm
|
||||
1626/la34.htm
|
||||
br-alm/95/95.html
|
||||
br-alm/96/96.html
|
||||
handbook/prospecting_guide.html
|
||||
handbook/prospecting_guide.png
|
||||
handbook/prospecting_guide_204area.png
|
||||
handbook/prospecting_guide_40area.png
|
||||
handbook/prospecting_guide_76area.png
|
||||
handbook/prospecting_guide_tcarea.png
|
||||
kratzer/186/186.html
|
||||
kratzer/1996wk12.html
|
||||
kratzer/2006-72/2006-72.html
|
||||
kratzer/36/36.html
|
||||
kratzer/71.htm
|
||||
kratzer/a1.htm
|
||||
kratzer/b1.htm
|
||||
kratzer/b2.htm
|
||||
kratzer/b3.htm
|
||||
kratzer/b4.htm
|
||||
kratzer/b5.htm
|
||||
noinfo/1626/117.htm
|
||||
noinfo/1626/120.htm
|
||||
noinfo/1626/122.htm
|
||||
noinfo/1626/5.htm
|
||||
noinfo/1626/50.htm
|
||||
noinfo/1626/55.htm
|
||||
noinfo/252.html
|
||||
noinfo/aaussee/1.htm
|
||||
noinfo/aaussee/2.htm
|
||||
noinfo/aaussee/51.htm
|
||||
noinfo/aaussee/68.htm
|
||||
noinfo/augstb/3.htm
|
||||
noinfo/augstb/4.htm
|
||||
noinfo/augstb/53.htm
|
||||
noinfo/augstb/54.htm
|
||||
noinfo/augstb/66.htm
|
||||
noinfo/br-alm/26.htm
|
||||
noinfo/br-alm/27.htm
|
||||
noinfo/br-alm/29.htm
|
||||
noinfo/br-alm/30.htm
|
||||
noinfo/br-alm/33.htm
|
||||
noinfo/br-alm/61.htm
|
||||
noinfo/egglgrub/15.htm
|
||||
noinfo/egglgrub/19.htm
|
||||
noinfo/egglgrub/20.htm
|
||||
noinfo/egglgrub/21.htm
|
||||
noinfo/egglgrub/22.htm
|
||||
noinfo/egglgrub/228.html
|
||||
noinfo/egglgrub/23.htm
|
||||
noinfo/egglgrub/24.htm
|
||||
noinfo/egglgrub/25.htm
|
||||
noinfo/egglgrub/77.htm
|
||||
noinfo/gschwand/10.htm
|
||||
noinfo/gschwand/11.htm
|
||||
noinfo/gschwand/12.htm
|
||||
noinfo/gschwand/5.htm
|
||||
noinfo/gschwand/52.htm
|
||||
noinfo/gschwand/6.htm
|
||||
noinfo/gschwand/60.htm
|
||||
noinfo/kratzer/34.htm
|
||||
noinfo/kratzer/35.htm
|
||||
noinfo/kratzer/39.htm
|
||||
noinfo/kratzer/43.htm
|
||||
noinfo/kratzer/44.htm
|
||||
noinfo/kratzer/73.htm
|
||||
noinfo/kratzer/74.htm
|
||||
noinfo/kratzer/75.htm
|
||||
noinfo/lengths.dat
|
||||
noinfo/loser/13.htm
|
||||
noinfo/loser/14.htm
|
||||
noinfo/loser/16.htm
|
||||
noinfo/loser/17.htm
|
||||
noinfo/loser/18.htm
|
||||
noinfo/loser/55.htm
|
||||
noinfo/loser/56.htm
|
||||
noinfo/loser/57.htm
|
||||
noinfo/loser/58.htm
|
||||
noinfo/loser/59.htm
|
||||
noinfo/loser/62.htm
|
||||
noinfo/loser/63.htm
|
||||
noinfo/loser/64.htm
|
||||
noinfo/loser/65.htm
|
||||
noinfo/loser/67.htm
|
||||
noinfo/loser/69.htm
|
||||
noinfo/loser/7.htm
|
||||
noinfo/loser/70.htm
|
||||
noinfo/loser/72.htm
|
||||
noinfo/loser/8.htm
|
||||
noinfo/loser/9.htm
|
||||
noinfo/make-indxal4.log
|
||||
noinfo/plateau/37.htm
|
||||
noinfo/plateau/38.htm
|
||||
noinfo/prospecting_guide.jpg
|
||||
noinfo/prospecting_guide_204area.jpg
|
||||
noinfo/prospecting_guide_40area.jpg
|
||||
noinfo/prospecting_guide_76area.jpg
|
||||
noinfo/prospecting_guide_scripts/dump3d
|
||||
noinfo/prospecting_guide_tcarea.jpg
|
||||
noinfo/remote/131.htm
|
||||
noinfo/remote/132.htm
|
||||
noinfo/remote/133.htm
|
||||
noinfo/remote/bs17.htm
|
||||
noinfo/remote/bs19.html
|
||||
noinfo/smk-system.err
|
||||
noinfo/smkridge/116.htm
|
||||
noinfo/smkridge/117.htm
|
||||
noinfo/smkridge/118.htm
|
||||
noinfo/smkridge/119.htm
|
||||
noinfo/smkridge/120.htm
|
||||
noinfo/smkridge/127.htm
|
||||
noinfo/smkridge/128.htm
|
||||
noinfo/smkridge/129.htm
|
||||
noinfo/smkridge/130.htm
|
||||
noinfo/smkridge/202.html
|
||||
noinfo/smkridge/203.html
|
||||
noinfo/smkridge/206.html
|
||||
noinfo/smkridge/28.htm
|
||||
noinfo/smkridge/31.htm
|
||||
noinfo/smkridge/32.htm
|
||||
noinfo/smkridge/40.htm
|
||||
noinfo/smkridge/40a.htm
|
||||
noinfo/smkridge/42.htm
|
||||
noinfo/smkridge/78.htm
|
||||
noinfo/smkridge/79.htm
|
||||
noinfo/smkridge/88.htm
|
||||
noinfo/wilden/134.htm
|
||||
noinfo/wilden/45.htm
|
||||
noinfo/wilden/46.htm
|
||||
noinfo/wilden/47.htm
|
||||
noinfo/wilden/48.htm
|
||||
noinfo/wilden/49.htm
|
||||
noinfo/wilden/50.htm
|
||||
|
||||
|
||||
|
||||
syntax: regexp
|
||||
10
Makefile
10
Makefile
@ -24,10 +24,10 @@ autogen_pages: indxal.htm
|
||||
# built manually in a survex build tree.
|
||||
indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat
|
||||
python noinfo/make-areaindices.py
|
||||
cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV
|
||||
-(cd noinfo && perl ./make-indxal4.pl CAVETAB2.CSV)
|
||||
|
||||
noinfo/lengths.dat:
|
||||
python noinfo/create_dplong_table.py
|
||||
-python noinfo/create_dplong_table.py || echo "Carry on and build other targets anyway"
|
||||
|
||||
noinfo/all.pos: noinfo/all.3d
|
||||
3dtopos noinfo/all.3d noinfo/all.pos
|
||||
@ -51,13 +51,17 @@ surveytable:
|
||||
|
||||
###########
|
||||
|
||||
qmlists: smkridge/204/qm.html smkridge/204/atoz.html smkridge/234/qm.html
|
||||
qmlists: smkridge/204/qm.html smkridge/204/atoz.html smkridge/234/qm.html smkridge/258/qm.html
|
||||
|
||||
smkridge/204/qm.html: smkridge/204/qm.csv smkridge/204/tablize-qms.pl
|
||||
cd smkridge/204; perl tablize-qms.pl qm.csv
|
||||
|
||||
smkridge/234/qm.html: smkridge/234/qm.csv smkridge/234/tablize-qms.pl
|
||||
cd smkridge/234; perl tablize-qms.pl qm.csv
|
||||
|
||||
smkridge/258/qm.html: smkridge/258/qm.csv smkridge/258/tablize-qms.pl
|
||||
cd smkridge/258; perl tablize-qms.pl qm.csv
|
||||
|
||||
smkridge/204/atoz.html: smkridge/204/glossary.csv smkridge/204/make-glossary.pl
|
||||
cd smkridge/204; perl make-glossary.pl glossary.csv
|
||||
|
||||
|
||||
20
bierbook/Makefile
Normal file
20
bierbook/Makefile
Normal file
@ -0,0 +1,20 @@
|
||||
all: bierbook3.ps seshbook3.ps bierbook.pdf seshbook.pdf
|
||||
|
||||
bierbook3.ps: bierbook.tex
|
||||
latex bierbook.tex
|
||||
dvips bierbook.dvi -T 148mm,210mm -o
|
||||
ps2pdf bierbook.ps
|
||||
psresize -Pa5 -pa4 bierbook.ps >bierbook1.ps
|
||||
psbook bierbook1.ps >bierbook2.ps
|
||||
psnup -la4 -2 bierbook2.ps >bierbook3.ps
|
||||
|
||||
seshbook3.ps: seshbook.tex
|
||||
latex seshbook.tex
|
||||
dvips seshbook.dvi -T 148mm,210mm -o
|
||||
ps2pdf seshbook.ps
|
||||
psresize -Pa5 -pa4 seshbook.ps >seshbook1.ps
|
||||
psbook seshbook1.ps >seshbook2.ps
|
||||
psnup -la4 -2 seshbook2.ps >seshbook3.ps
|
||||
|
||||
# Then print using:
|
||||
# lpr -Pelder -tumble bierbook3.ps
|
||||
22
bierbook/README
Normal file
22
bierbook/README
Normal file
@ -0,0 +1,22 @@
|
||||
|
||||
Bierbook source attached. Edit bierbook.tex then make to build a pdf.
|
||||
|
||||
Things to edit in bierbook.tex:
|
||||
|
||||
* There are about 3 commands near the top that need to be changed to
|
||||
reflect the people going to expo
|
||||
|
||||
* Personal details are about half way through the file.
|
||||
|
||||
* The dates for the weather pages
|
||||
|
||||
* There were complaints about the seshtable so this might need to be
|
||||
rethought. A rigid format was adopted last year which people didn't
|
||||
like, maybe just leave some blankish pages for seshes instead
|
||||
|
||||
* The treasurer details and revision date
|
||||
|
||||
* Maybe leave a few more pages for quotes and fewer for In Austria
|
||||
Jollies (or remove the In Austria Jollies section completely depending
|
||||
on how you're doing it)
|
||||
|
||||
733
bierbook/bb.cls
Normal file
733
bierbook/bb.cls
Normal file
@ -0,0 +1,733 @@
|
||||
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
|
||||
\ProvidesClass{bb}
|
||||
[2001/08/02 v1.0
|
||||
Bier Book class]
|
||||
\DeclareFixedFont{\titlefont}{OT1}{phv}{b}{n}{36pt}
|
||||
\DeclareFixedFont{\aftertitlefont}{OT1}{phv}{m}{n}{10pt}
|
||||
\DeclareFixedFont{\titlepagefont}{OT1}{phv}{b}{n}{19pt}
|
||||
\DeclareFixedFont{\titlepagefontm}{OT1}{phv}{m}{n}{15pt}
|
||||
\DeclareFixedFont{\titlepagefontms}{OT1}{phv}{m}{n}{13pt}
|
||||
\DeclareFixedFont{\titlepagefonts}{OT1}{phv}{m}{n}{12pt}
|
||||
\DeclareFixedFont{\chapterfont}{OT1}{phv}{b}{n}{16pt}
|
||||
\DeclareFixedFont{\chapterfontnonbold}{OT1}{phv}{m}{n}{16pt}
|
||||
\DeclareFixedFont{\sectionfont}{OT1}{phv}{b}{n}{14pt}
|
||||
\DeclareFixedFont{\subsectionfont}{OT1}{phv}{m}{n}{12pt}
|
||||
\DeclareFixedFont{\subsubsectionfont}{OT1}{phv}{m}{n}{11pt}
|
||||
|
||||
\newcommand\@ptsize{}
|
||||
\newif\if@restonecol
|
||||
\newif\if@titlepage
|
||||
\@titlepagetrue
|
||||
\newif\if@openright
|
||||
\if@compatibility\else
|
||||
\DeclareOption{a4paper}
|
||||
{\setlength\paperheight {297mm}%
|
||||
\setlength\paperwidth {210mm}}
|
||||
\DeclareOption{a5paper}
|
||||
{\setlength\paperheight {210mm}%
|
||||
\setlength\paperwidth {148mm}}
|
||||
\DeclareOption{b5paper}
|
||||
{\setlength\paperheight {250mm}%
|
||||
\setlength\paperwidth {176mm}}
|
||||
\DeclareOption{letterpaper}
|
||||
{\setlength\paperheight {11in}%
|
||||
\setlength\paperwidth {8.5in}}
|
||||
\DeclareOption{legalpaper}
|
||||
{\setlength\paperheight {14in}%
|
||||
\setlength\paperwidth {8.5in}}
|
||||
\DeclareOption{executivepaper}
|
||||
{\setlength\paperheight {10.5in}%
|
||||
\setlength\paperwidth {7.25in}}
|
||||
\DeclareOption{landscape}
|
||||
{\setlength\@tempdima {\paperheight}%
|
||||
\setlength\paperheight {\paperwidth}%
|
||||
\setlength\paperwidth {\@tempdima}}
|
||||
\fi
|
||||
\if@compatibility
|
||||
\renewcommand\@ptsize{0}
|
||||
\else
|
||||
\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
|
||||
\fi
|
||||
\DeclareOption{11pt}{\renewcommand\@ptsize{1}}
|
||||
\DeclareOption{12pt}{\renewcommand\@ptsize{2}}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
|
||||
\fi
|
||||
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
|
||||
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{final}{\setlength\overfullrule{0pt}}
|
||||
\fi
|
||||
\DeclareOption{titlepage}{\@titlepagetrue}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{notitlepage}{\@titlepagefalse}
|
||||
\fi
|
||||
\if@compatibility
|
||||
\else
|
||||
\DeclareOption{openright}{\@openrighttrue}
|
||||
\DeclareOption{openany}{\@openrightfalse}
|
||||
\fi
|
||||
\if@compatibility\else
|
||||
\DeclareOption{onecolumn}{\@twocolumnfalse}
|
||||
\fi
|
||||
\DeclareOption{twocolumn}{\@twocolumntrue}
|
||||
\DeclareOption{leqno}{\input{leqno.clo}}
|
||||
\DeclareOption{fleqn}{\input{fleqn.clo}}
|
||||
\DeclareOption{openbib}{%
|
||||
\AtEndOfPackage{%
|
||||
\renewcommand\@openbib@code{%
|
||||
\advance\leftmargin\bibindent
|
||||
\itemindent -\bibindent
|
||||
\listparindent \itemindent
|
||||
\parsep \z@
|
||||
}%
|
||||
\renewcommand\newblock{\par}}%
|
||||
}
|
||||
\ExecuteOptions{letterpaper,10pt,oneside,onecolumn,final,openany}
|
||||
\ProcessOptions
|
||||
\input{size1\@ptsize.clo}
|
||||
\setlength\lineskip{1\p@}
|
||||
\setlength\normallineskip{1\p@}
|
||||
\renewcommand\baselinestretch{}
|
||||
\setlength\parskip{0\p@ \@plus \p@}
|
||||
\@lowpenalty 51
|
||||
\@medpenalty 151
|
||||
\@highpenalty 301
|
||||
\setcounter{topnumber}{2}
|
||||
\renewcommand\topfraction{.7}
|
||||
\setcounter{bottomnumber}{1}
|
||||
\renewcommand\bottomfraction{.3}
|
||||
\setcounter{totalnumber}{3}
|
||||
\renewcommand\textfraction{.2}
|
||||
\renewcommand\floatpagefraction{.5}
|
||||
\setcounter{dbltopnumber}{2}
|
||||
\renewcommand\dbltopfraction{.7}
|
||||
\renewcommand\dblfloatpagefraction{.5}
|
||||
\if@twoside
|
||||
\def\ps@headings{%
|
||||
\let\@oddfoot\@empty\let\@evenfoot\@empty
|
||||
\def\@evenhead{\thepage\hfil\slshape\leftmark}%
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\markboth
|
||||
\def\chaptermark##1{%
|
||||
\markboth {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
\@chapapp\ \thechapter. \ %
|
||||
\fi
|
||||
##1}}{}}%
|
||||
\def\sectionmark##1{%
|
||||
\markright {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\z@
|
||||
\thesection. \ %
|
||||
\fi
|
||||
##1}}}}
|
||||
\else
|
||||
\def\ps@headings{%
|
||||
\let\@oddfoot\@empty
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\markboth
|
||||
\def\chaptermark##1{%
|
||||
\markright {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
\@chapapp\ \thechapter. \ %
|
||||
\fi
|
||||
##1}}}}
|
||||
\fi
|
||||
\def\ps@myheadings{%
|
||||
\let\@oddfoot\@empty\let\@evenfoot\@empty
|
||||
\def\@evenhead{\thepage\hfil\slshape\leftmark}%
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\@gobbletwo
|
||||
\let\chaptermark\@gobble
|
||||
\let\sectionmark\@gobble
|
||||
}
|
||||
\if@titlepage
|
||||
\newcommand\maketitle{\begin{titlepage}%
|
||||
\let\footnotesize\small
|
||||
\let\footnoterule\relax
|
||||
\let \footnote \thanks
|
||||
\null\vfil
|
||||
\vskip 60\p@
|
||||
\begin{center}%
|
||||
{\LARGE \@title \par}%
|
||||
\vskip 3em%
|
||||
{\large
|
||||
\lineskip .75em%
|
||||
\begin{tabular}[t]{c}%
|
||||
\@author
|
||||
\end{tabular}\par}%
|
||||
\vskip 1.5em%
|
||||
{\large \@date \par}% % Set date in \large size.
|
||||
\end{center}\par
|
||||
\@thanks
|
||||
\vfil\null
|
||||
\end{titlepage}%
|
||||
\setcounter{footnote}{0}%
|
||||
\global\let\thanks\relax
|
||||
\global\let\maketitle\relax
|
||||
\global\let\@thanks\@empty
|
||||
\global\let\@author\@empty
|
||||
\global\let\@date\@empty
|
||||
\global\let\@title\@empty
|
||||
\global\let\title\relax
|
||||
\global\let\author\relax
|
||||
\global\let\date\relax
|
||||
\global\let\and\relax
|
||||
}
|
||||
\else
|
||||
\newcommand\maketitle{\par
|
||||
\begingroup
|
||||
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
|
||||
\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
|
||||
\long\def\@makefntext##1{\parindent 1em\noindent
|
||||
\hb@xt@1.8em{%
|
||||
\hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
|
||||
\if@twocolumn
|
||||
\ifnum \col@number=\@ne
|
||||
\@maketitle
|
||||
\else
|
||||
\twocolumn[\@maketitle]%
|
||||
\fi
|
||||
\else
|
||||
\newpage
|
||||
\global\@topnum\z@ % Prevents figures from going at top of page.
|
||||
\@maketitle
|
||||
\fi
|
||||
\thispagestyle{plain}\@thanks
|
||||
\endgroup
|
||||
\setcounter{footnote}{0}%
|
||||
\global\let\thanks\relax
|
||||
\global\let\maketitle\relax
|
||||
\global\let\@maketitle\relax
|
||||
\global\let\@thanks\@empty
|
||||
\global\let\@author\@empty
|
||||
\global\let\@date\@empty
|
||||
\global\let\@title\@empty
|
||||
\global\let\title\relax
|
||||
\global\let\author\relax
|
||||
\global\let\date\relax
|
||||
\global\let\and\relax
|
||||
}
|
||||
\def\@maketitle{%
|
||||
\newpage
|
||||
\null
|
||||
\vskip 2em%
|
||||
\begin{center}%
|
||||
\let \footnote \thanks
|
||||
{\LARGE \@title \par}%
|
||||
\vskip 1.5em%
|
||||
{\large
|
||||
\lineskip .5em%
|
||||
\begin{tabular}[t]{c}%
|
||||
\@author
|
||||
\end{tabular}\par}%
|
||||
\vskip 1em%
|
||||
{\large \@date}%
|
||||
\end{center}%
|
||||
\par
|
||||
\vskip 1.5em}
|
||||
\fi
|
||||
\newcommand*\chaptermark[1]{}
|
||||
\setcounter{secnumdepth}{2}
|
||||
\newcounter {part}
|
||||
\newcounter {chapter}
|
||||
\newcounter {section}[chapter]
|
||||
\newcounter {subsection}[section]
|
||||
\newcounter {subsubsection}[subsection]
|
||||
\newcounter {paragraph}[subsubsection]
|
||||
\newcounter {subparagraph}[paragraph]
|
||||
\renewcommand \thepart {\@Roman\c@part}
|
||||
\renewcommand \thechapter {\@arabic\c@chapter}
|
||||
\renewcommand \thesection {\thechapter.\@arabic\c@section}
|
||||
\renewcommand\thesubsection {\thesection.\@arabic\c@subsection}
|
||||
\renewcommand\thesubsubsection{\thesubsection .\@arabic\c@subsubsection}
|
||||
\renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph}
|
||||
\renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}
|
||||
\newcommand\@chapapp{\chaptername}
|
||||
\newcommand\part{%
|
||||
\if@openright
|
||||
\cleardoublepage
|
||||
\else
|
||||
\clearpage
|
||||
\fi
|
||||
\thispagestyle{plain}%
|
||||
\if@twocolumn
|
||||
\onecolumn
|
||||
\@tempswatrue
|
||||
\else
|
||||
\@tempswafalse
|
||||
\fi
|
||||
\null\vfil
|
||||
\secdef\@part\@spart}
|
||||
|
||||
\def\@part[#1]#2{%
|
||||
\ifnum \c@secnumdepth >-2\relax
|
||||
\refstepcounter{part}%
|
||||
\addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{part}{#1}%
|
||||
\fi
|
||||
\markboth{}{}%
|
||||
{\centering
|
||||
\interlinepenalty \@M
|
||||
\normalfont
|
||||
\ifnum \c@secnumdepth >-2\relax
|
||||
\huge\bfseries \partname~\thepart
|
||||
\par
|
||||
\vskip 20\p@
|
||||
\fi
|
||||
\Huge \bfseries #2\par}%
|
||||
\@endpart}
|
||||
\def\@spart#1{%
|
||||
{\centering
|
||||
\interlinepenalty \@M
|
||||
\normalfont
|
||||
\Huge \bfseries #1\par}%
|
||||
\@endpart}
|
||||
\def\@endpart{\vfil\newpage
|
||||
\if@twoside
|
||||
\null
|
||||
\thispagestyle{empty}%
|
||||
\newpage
|
||||
\fi
|
||||
\if@tempswa
|
||||
\twocolumn
|
||||
\fi}
|
||||
\newcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
|
||||
\thispagestyle{plain}%
|
||||
\global\@topnum\z@
|
||||
\@afterindentfalse
|
||||
\secdef\@chapter\@schapter}
|
||||
\newcommand\chapternotoc{\if@openright\cleardoublepage\else\clearpage\fi
|
||||
\thispagestyle{plain}%
|
||||
\global\@topnum\z@
|
||||
\@afterindentfalse
|
||||
\secdef\@chapternotoc\@schapter}
|
||||
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
|
||||
\refstepcounter{chapter}%
|
||||
\typeout{\@chapapp\space\thechapter.}%
|
||||
\addcontentsline{toc}{chapter}%
|
||||
{\protect\numberline{\thechapter}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{chapter}{#1}%
|
||||
\fi
|
||||
\chaptermark{#1}%
|
||||
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||
\if@twocolumn
|
||||
\@topnewpage[\@makechapterhead{#2}]%
|
||||
\else
|
||||
\@makechapterhead{#2}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@chapternotoc[#1]#2{\ifnum \c@secnumdepth >\m@ne
|
||||
\refstepcounter{chapter}%
|
||||
\typeout{\@chapapp\space\thechapter.}%
|
||||
%% \addcontentsline{toc}{chapter}%
|
||||
%% {\protect\numberline{\thechapter}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{chapter}{#1}%
|
||||
\fi
|
||||
\chaptermark{#1}%
|
||||
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||
\if@twocolumn
|
||||
\@topnewpage[\@makechapterhead{#2}]%
|
||||
\else
|
||||
\@makechapterhead{#2}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@makechapterhead#1{%
|
||||
%% \vspace*{2\p@}%
|
||||
{\parindent \z@ \raggedright \normalfont
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
%% \hrulefill
|
||||
%% \vskip 2\p@
|
||||
%% \chapterfontnonbold \@chapapp\space \psshadowbox[linecolor=white]{\parbox{2.5cm}{\thechapter}}\ --\ %
|
||||
%% \chapterfontnonbold\psshadowbox{\parbox[t][1.2cm][c]{1.2cm}{\begin{center}\thechapter\end{center}}} \space\space
|
||||
%% \par\nobreak
|
||||
%% \vskip 20\p@
|
||||
\fi
|
||||
%% \interlinepenalty\@M
|
||||
\parbox[t][1.2cm][c]{\textwidth}{\vfill\chapterfont #1 \vfill}
|
||||
|
||||
\vskip 12\p@
|
||||
%% \hrulefill\\
|
||||
%% \vskip 40\p@
|
||||
}}
|
||||
\def\@schapter#1{\if@twocolumn
|
||||
\@topnewpage[\@makeschapterhead{#1}]%
|
||||
\else
|
||||
\@makeschapterhead{#1}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@makeschapterhead#1{%
|
||||
\vspace*{50\p@}%
|
||||
{\parindent \z@ \raggedright
|
||||
\normalfont
|
||||
\interlinepenalty\@M
|
||||
\chapterfont #1\par\nobreak
|
||||
\vskip 40\p@
|
||||
}}
|
||||
|
||||
\newcommand\section{\@startsection{section}{1}{0pt}{-3.5ex plus -1ex minus -.2ex}{2.3ex plus.2ex}{\sectionfont}}
|
||||
\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
|
||||
{-3.25ex\@plus -1ex \@minus -.2ex}%
|
||||
{1.5ex \@plus .2ex}%
|
||||
{\subsectionfont}}
|
||||
\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
|
||||
{-3.25ex\@plus -1ex \@minus -.2ex}%
|
||||
{1.5ex \@plus .2ex}%
|
||||
{\subsubsectionfont}}
|
||||
\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{3.25ex \@plus1ex \@minus.2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}
|
||||
\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
|
||||
{3.25ex \@plus1ex \@minus .2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}
|
||||
\if@twocolumn
|
||||
\setlength\leftmargini {2em}
|
||||
\else
|
||||
\setlength\leftmargini {2.5em}
|
||||
\fi
|
||||
\leftmargin \leftmargini
|
||||
\setlength\leftmarginii {2.2em}
|
||||
\setlength\leftmarginiii {1.87em}
|
||||
\setlength\leftmarginiv {1.7em}
|
||||
\if@twocolumn
|
||||
\setlength\leftmarginv {.5em}
|
||||
\setlength\leftmarginvi {.5em}
|
||||
\else
|
||||
\setlength\leftmarginv {1em}
|
||||
\setlength\leftmarginvi {1em}
|
||||
\fi
|
||||
\setlength \labelsep {.5em}
|
||||
\setlength \labelwidth{\leftmargini}
|
||||
\addtolength\labelwidth{-\labelsep}
|
||||
\@beginparpenalty -\@lowpenalty
|
||||
\@endparpenalty -\@lowpenalty
|
||||
\@itempenalty -\@lowpenalty
|
||||
\renewcommand\theenumi{\@arabic\c@enumi}
|
||||
\renewcommand\theenumii{\@alph\c@enumii}
|
||||
\renewcommand\theenumiii{\@roman\c@enumiii}
|
||||
\renewcommand\theenumiv{\@Alph\c@enumiv}
|
||||
\newcommand\labelenumi{\theenumi.}
|
||||
\newcommand\labelenumii{(\theenumii)}
|
||||
\newcommand\labelenumiii{\theenumiii.}
|
||||
\newcommand\labelenumiv{\theenumiv.}
|
||||
\renewcommand\p@enumii{\theenumi}
|
||||
\renewcommand\p@enumiii{\theenumi(\theenumii)}
|
||||
\renewcommand\p@enumiv{\p@enumiii\theenumiii}
|
||||
\newcommand\labelitemi{\textbullet}
|
||||
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
||||
\newcommand\labelitemiii{\textasteriskcentered}
|
||||
\newcommand\labelitemiv{\textperiodcentered}
|
||||
\newenvironment{description}
|
||||
{\list{}{\labelwidth\z@ \itemindent-\leftmargin
|
||||
\let\makelabel\descriptionlabel}}
|
||||
{\endlist}
|
||||
\newcommand*\descriptionlabel[1]{\hspace\labelsep
|
||||
\normalfont\bfseries #1}
|
||||
\if@titlepage
|
||||
\newenvironment{abstract}{%
|
||||
\titlepage
|
||||
\null\vfil
|
||||
\@beginparpenalty\@lowpenalty
|
||||
\begin{center}%
|
||||
\bfseries \abstractname
|
||||
\@endparpenalty\@M
|
||||
\end{center}}%
|
||||
{\par\vfil\null\endtitlepage}
|
||||
\else
|
||||
\newenvironment{abstract}{%
|
||||
\if@twocolumn
|
||||
\section*{\abstractname}%
|
||||
\else
|
||||
\small
|
||||
\begin{center}%
|
||||
{\bfseries \abstractname\vspace{-.5em}\vspace{\z@}}%
|
||||
\end{center}%
|
||||
\quotation
|
||||
\fi}
|
||||
{\if@twocolumn\else\endquotation\fi}
|
||||
\fi
|
||||
\newenvironment{verse}
|
||||
{\let\\\@centercr
|
||||
\list{}{\itemsep \z@
|
||||
\itemindent -1.5em%
|
||||
\listparindent\itemindent
|
||||
\rightmargin \leftmargin
|
||||
\advance\leftmargin 1.5em}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\newenvironment{quotation}
|
||||
{\list{}{\listparindent 1.5em%
|
||||
\itemindent \listparindent
|
||||
\rightmargin \leftmargin
|
||||
\parsep \z@ \@plus\p@}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\newenvironment{quote}
|
||||
{\list{}{\rightmargin\leftmargin}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\if@compatibility
|
||||
\newenvironment{titlepage}
|
||||
{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse\newpage
|
||||
\fi
|
||||
\thispagestyle{empty}%
|
||||
\setcounter{page}\z@
|
||||
}%
|
||||
{\if@restonecol\twocolumn \else \newpage \fi
|
||||
}
|
||||
\else
|
||||
\newenvironment{titlepage}
|
||||
{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse\newpage
|
||||
\fi
|
||||
\thispagestyle{empty}%
|
||||
\setcounter{page}\@ne
|
||||
}%
|
||||
{\if@restonecol\twocolumn \else \newpage \fi
|
||||
\if@twoside\else
|
||||
\setcounter{page}\@ne
|
||||
\fi
|
||||
}
|
||||
\fi
|
||||
\newcommand\appendix{\par
|
||||
\setcounter{chapter}{0}%
|
||||
\setcounter{section}{0}%
|
||||
\gdef\@chapapp{\appendixname}%
|
||||
\gdef\thechapter{\@Alph\c@chapter}}
|
||||
\newcommand\afterappendix{\par
|
||||
\setcounter{chapter}{0}%
|
||||
\setcounter{section}{0}%
|
||||
\gdef\@chapapp{\chaptername}%
|
||||
\gdef\thechapter{\@arabic\c@chapter}}
|
||||
\setlength\arraycolsep{5\p@}
|
||||
\setlength\tabcolsep{6\p@}
|
||||
\setlength\arrayrulewidth{.4\p@}
|
||||
\setlength\doublerulesep{2\p@}
|
||||
\setlength\tabbingsep{\labelsep}
|
||||
\skip\@mpfootins = \skip\footins
|
||||
\setlength\fboxsep{3\p@}
|
||||
\setlength\fboxrule{.4\p@}
|
||||
\@addtoreset {equation}{chapter}
|
||||
\renewcommand\theequation
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation}
|
||||
\newcounter{figure}[chapter]
|
||||
\renewcommand \thefigure
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@figure}
|
||||
\def\fps@figure{tbp}
|
||||
\def\ftype@figure{1}
|
||||
\def\ext@figure{lof}
|
||||
\def\fnum@figure{\figurename~\thefigure}
|
||||
\newenvironment{figure}
|
||||
{\@float{figure}}
|
||||
{\end@float}
|
||||
\newenvironment{figure*}
|
||||
{\@dblfloat{figure}}
|
||||
{\end@dblfloat}
|
||||
\newcounter{table}[chapter]
|
||||
\renewcommand \thetable
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@table}
|
||||
\def\fps@table{tbp}
|
||||
\def\ftype@table{2}
|
||||
\def\ext@table{lot}
|
||||
\def\fnum@table{\tablename~\thetable}
|
||||
\newenvironment{table}
|
||||
{\@float{table}}
|
||||
{\end@float}
|
||||
\newenvironment{table*}
|
||||
{\@dblfloat{table}}
|
||||
{\end@dblfloat}
|
||||
\newlength\abovecaptionskip
|
||||
\newlength\belowcaptionskip
|
||||
\setlength\abovecaptionskip{10\p@}
|
||||
\setlength\belowcaptionskip{0\p@}
|
||||
\long\def\@makecaption#1#2{%
|
||||
\vskip\abovecaptionskip
|
||||
\sbox\@tempboxa{#1: #2}%
|
||||
\ifdim \wd\@tempboxa >\hsize
|
||||
#1: #2\par
|
||||
\else
|
||||
\global \@minipagefalse
|
||||
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
|
||||
\fi
|
||||
\vskip\belowcaptionskip}
|
||||
\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
|
||||
\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
|
||||
\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
|
||||
\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
|
||||
\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
|
||||
\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
|
||||
\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
|
||||
\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
|
||||
\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
|
||||
\newcommand\@pnumwidth{1.55em}
|
||||
\newcommand\@tocrmarg{2.55em}
|
||||
\newcommand\@dotsep{4.5}
|
||||
\setcounter{tocdepth}{2}
|
||||
\newcommand\tableofcontents{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\contentsname
|
||||
\@mkboth{%
|
||||
\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
|
||||
\@starttoc{toc}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\newcommand*\l@part[2]{%
|
||||
\ifnum \c@tocdepth >-2\relax
|
||||
\addpenalty{-\@highpenalty}%
|
||||
\addvspace{2.25em \@plus\p@}%
|
||||
\begingroup
|
||||
\parindent \z@ \rightskip \@pnumwidth
|
||||
\parfillskip -\@pnumwidth
|
||||
{\leavevmode
|
||||
\large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
|
||||
\nobreak
|
||||
\global\@nobreaktrue
|
||||
\everypar{\global\@nobreakfalse\everypar{}}%
|
||||
\endgroup
|
||||
\fi}
|
||||
\newcommand*\l@chapter[2]{%
|
||||
\ifnum \c@tocdepth >\m@ne
|
||||
\addpenalty{-\@highpenalty}%
|
||||
\vskip 1.0em \@plus\p@
|
||||
\setlength\@tempdima{1.5em}%
|
||||
\begingroup
|
||||
\parindent \z@ \rightskip \@pnumwidth
|
||||
\parfillskip -\@pnumwidth
|
||||
\leavevmode \bfseries
|
||||
\advance\leftskip\@tempdima
|
||||
\hskip -\leftskip
|
||||
#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
|
||||
\penalty\@highpenalty
|
||||
\endgroup
|
||||
\fi}
|
||||
\newcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}}
|
||||
\newcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}}
|
||||
\newcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}}
|
||||
\newcommand*\l@paragraph{\@dottedtocline{4}{10em}{5em}}
|
||||
\newcommand*\l@subparagraph{\@dottedtocline{5}{12em}{6em}}
|
||||
\newcommand\listoffigures{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\listfigurename
|
||||
\@mkboth{\MakeUppercase\listfigurename}%
|
||||
{\MakeUppercase\listfigurename}}%
|
||||
\@starttoc{lof}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
|
||||
\newcommand\listoftables{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\listtablename
|
||||
\@mkboth{%
|
||||
\MakeUppercase\listtablename}{\MakeUppercase\listtablename}}%
|
||||
\@starttoc{lot}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\let\l@table\l@figure
|
||||
\newdimen\bibindent
|
||||
\setlength\bibindent{1.5em}
|
||||
\newenvironment{thebibliography}[1]
|
||||
{\chapter*{\bibname
|
||||
\@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}}%
|
||||
\list{\@biblabel{\@arabic\c@enumiv}}%
|
||||
{\settowidth\labelwidth{\@biblabel{#1}}%
|
||||
\leftmargin\labelwidth
|
||||
\advance\leftmargin\labelsep
|
||||
\@openbib@code
|
||||
\usecounter{enumiv}%
|
||||
\let\p@enumiv\@empty
|
||||
\renewcommand\theenumiv{\@arabic\c@enumiv}}%
|
||||
\sloppy
|
||||
\clubpenalty4000
|
||||
\@clubpenalty \clubpenalty
|
||||
\widowpenalty4000%
|
||||
\sfcode`\.\@m}
|
||||
{\def\@noitemerr
|
||||
{\@latex@warning{Empty `thebibliography' environment}}%
|
||||
\endlist}
|
||||
\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
|
||||
\let\@openbib@code\@empty
|
||||
\newenvironment{theindex}
|
||||
{\if@twocolumn
|
||||
\@restonecolfalse
|
||||
\else
|
||||
\@restonecoltrue
|
||||
\fi
|
||||
\columnseprule \z@
|
||||
\columnsep 35\p@
|
||||
\twocolumn[\@makeschapterhead{\indexname}]%
|
||||
\@mkboth{\MakeUppercase\indexname}%
|
||||
{\MakeUppercase\indexname}%
|
||||
\thispagestyle{plain}\parindent\z@
|
||||
\parskip\z@ \@plus .3\p@\relax
|
||||
\let\item\@idxitem}
|
||||
{\if@restonecol\onecolumn\else\clearpage\fi}
|
||||
\newcommand\@idxitem{\par\hangindent 40\p@}
|
||||
\newcommand\subitem{\@idxitem \hspace*{20\p@}}
|
||||
\newcommand\subsubitem{\@idxitem \hspace*{30\p@}}
|
||||
\newcommand\indexspace{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
|
||||
\renewcommand\footnoterule{%
|
||||
\kern-3\p@
|
||||
\hrule\@width.4\columnwidth
|
||||
\kern2.6\p@}
|
||||
\@addtoreset{footnote}{chapter}
|
||||
\newcommand\@makefntext[1]{%
|
||||
\parindent 1em%
|
||||
\noindent
|
||||
\hb@xt@1.8em{\hss\@makefnmark}#1}
|
||||
\newcommand\contentsname{Contents}
|
||||
\newcommand\listfigurename{List of Figures}
|
||||
\newcommand\listtablename{List of Tables}
|
||||
\newcommand\bibname{Bibliography}
|
||||
\newcommand\indexname{Index}
|
||||
\newcommand\figurename{Figure}
|
||||
\newcommand\tablename{Table}
|
||||
\newcommand\partname{Part}
|
||||
\newcommand\chaptername{Chapter}
|
||||
\newcommand\appendixname{Appendix}
|
||||
\newcommand\abstractname{Abstract}
|
||||
\def\today{\ifcase\month\or
|
||||
January\or February\or March\or April\or May\or June\or
|
||||
July\or August\or September\or October\or November\or December\fi
|
||||
\space\number\day, \number\year}
|
||||
\setlength\columnsep{10\p@}
|
||||
\setlength\columnseprule{0\p@}
|
||||
\pagestyle{plain}
|
||||
\pagenumbering{arabic}
|
||||
\if@twoside
|
||||
\else
|
||||
\raggedbottom
|
||||
\fi
|
||||
\if@twocolumn
|
||||
\twocolumn
|
||||
\sloppy
|
||||
\flushbottom
|
||||
\else
|
||||
\onecolumn
|
||||
\fi
|
||||
\endinput
|
||||
808
bierbook/bierbook.tex
Normal file
808
bierbook/bierbook.tex
Normal file
@ -0,0 +1,808 @@
|
||||
%%
|
||||
%% CUCC Expo Bier Book
|
||||
%%
|
||||
|
||||
\documentclass[a5paper,10pt]{bb}
|
||||
|
||||
\usepackage{pstricks}
|
||||
\usepackage{tabularx}
|
||||
\usepackage{color}
|
||||
\usepackage{calc}
|
||||
\usepackage[left=13mm,right=15mm,top=8mm,bottom=20mm]{geometry}
|
||||
%\usepackage[left=15mm,right=5mm,top=-5mm,bottom=20mm]{geometry}
|
||||
\usepackage{palatino}
|
||||
\usepackage{grid}
|
||||
%\usepackage{graphpap}
|
||||
\usepackage{url}
|
||||
\setlength{\parskip}{1.5ex}
|
||||
\setlength{\parindent}{0pt}
|
||||
|
||||
%xunit=8pt,yunit=11pt
|
||||
\newcommand{\boxes}[1][35]{%
|
||||
\psgrid[gridlabelcolor=white,subgriddiv=1,xunit=19pt,yunit=17pt](0,0)(0,0)(#1,1)\vspace{0.3ex}}
|
||||
|
||||
\setlength{\unitlength}{9.5pt}
|
||||
\newlength\boxheight
|
||||
\setlength{\boxheight}{\textheight-1cm}
|
||||
|
||||
\newcommand{\tallya}{%
|
||||
\medskip
|
||||
\scalebox{1.2 1.2}{
|
||||
%\parbox[c][\boxheight]{1.5cm}{
|
||||
\parbox[c]{1.5cm}{
|
||||
\small
|
||||
\setlength{\bigskipamount}{8.25pt}
|
||||
Aaron\bigskip\\
|
||||
Becka\bigskip\\
|
||||
Djuke\bigskip\\
|
||||
Edvin\bigskip\\
|
||||
Frank\bigskip\\
|
||||
Jess\bigskip\\
|
||||
Julian\bigskip\\
|
||||
Kathryn\bigskip\\
|
||||
Mark\bigskip\\
|
||||
Martin G\bigskip\\
|
||||
Martin J\bigskip\\
|
||||
Natalie\bigskip\\
|
||||
Nial\bigskip\\
|
||||
Olly M\bigskip\\
|
||||
Ollie S\bigskip\\
|
||||
Pete\bigskip\\
|
||||
Serena\bigskip\\
|
||||
Steve\bigskip\\
|
||||
Tony
|
||||
}
|
||||
\parbox[c]{\textwidth-5cm}{\graphpaper[1](0,0)(25,38)}}}
|
||||
|
||||
\newcommand{\tallyb}{%
|
||||
\medskip
|
||||
\scalebox{1.2 1.2}{
|
||||
%\parbox[c][\boxheight]{1.5cm}{
|
||||
\parbox[c][]{1.5cm}{
|
||||
\small
|
||||
\setlength{\bigskipamount}{8.25pt}
|
||||
Kathryn\bigskip\\
|
||||
Mark D\bigskip\\
|
||||
Mark S\bigskip\\
|
||||
Martin\bigskip\\
|
||||
Morven\bigskip\\
|
||||
Nial\bigskip\\
|
||||
Ollie S\bigskip\\
|
||||
Olly B\bigskip\\
|
||||
Pete\bigskip\\
|
||||
Phil\bigskip\\
|
||||
Richard\bigskip\\
|
||||
Sarah\bigskip\\
|
||||
Tony R\bigskip\\
|
||||
Wookey\bigskip\\
|
||||
\ldots\ldots\ldots\bigskip\\
|
||||
\ldots\ldots\ldots\bigskip\\
|
||||
\ldots\ldots\ldots\bigskip
|
||||
}
|
||||
\parbox[c]{\textwidth-5cm}{\graphpaper[1](0,0)(25,38)}}}
|
||||
|
||||
\newcommand{\datetallyfirsta}{%
|
||||
\begin{tabularx}{\textwidth}{lll}
|
||||
& \vspace{2.2ex}
|
||||
\bf{18--24 Jul} \hspace{9.7em} & \bf{25--31 Jul}\\
|
||||
{\bf Aaron} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Becka} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Djuke} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Edvin} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Frank} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Jess} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Julian} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Kathryn} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Mark} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Martin G} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Martin J} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Natalie} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Nial} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Olly M} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Ollie S} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Pete} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Serena} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Steve} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Tony} & \boxes[7] & \boxes[7]\medskip\\
|
||||
\end{tabularx}
|
||||
}
|
||||
|
||||
\newcommand{\datetallyseconda}{%
|
||||
\begin{tabularx}{\textwidth}{lll}
|
||||
& \vspace{2.2ex}
|
||||
\bf{1--7 Aug} \hspace{9.7em} & \bf{8--14 Aug} \\
|
||||
{\bf Aaron} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Becka} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Djuke} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Edvin} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Frank} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Jess} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Julian} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Kathryn} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Mark} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Martin G} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Martin J} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Natalie} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Nial} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Olly M} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Ollie S} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Pete} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Serena} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Steve} & \boxes[7] & \boxes[7]\medskip\\
|
||||
{\bf Tony} & \boxes[7] & \boxes[7]\medskip\\
|
||||
\end{tabularx}
|
||||
}
|
||||
|
||||
\newcommand{\transporttable}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|l|X}
|
||||
{\bf Method}&{\bf Left UK}&{\bf Arrived}
|
||||
&{\bf Notes}\\\hline
|
||||
\rule{0pt}{13cm} &&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\seshtable}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Debtor(s)}&{\bf Creditor}&{\bf Description}&{\bf Cost}
|
||||
\\\hline
|
||||
\rule{0pt}{13cm} &&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\seshtabletwo}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Debtor(s)}&{\bf Creditor}&{\bf Description}&{\bf Cost}
|
||||
\\\hline
|
||||
\rule{0pt}{16cm} &&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\inaustriatranstable}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Driver}&{\bf Passengers}&{\bf Description}&{\bf Approx Dist}
|
||||
\\\hline
|
||||
\rule{0pt}{13cm} &&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\inaustriatranstabletwo}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Driver}&{\bf Passengers}&{\bf Description}&{\bf Approx Dist}
|
||||
\\\hline
|
||||
\rule{0pt}{16cm} &&&
|
||||
\end{tabularx}}
|
||||
|
||||
|
||||
\newcommand{\moneytable}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Date}&{\bf Owed by}&{\bf Description}
|
||||
&{\bf Amount}\\\hline
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\moneytabletwo}{%
|
||||
\begin{tabularx}{\textwidth}{l|l|X|l}
|
||||
{\bf Date}&{\bf Owed by}&{\bf Description}
|
||||
&{\bf Amount}\\\hline
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\
|
||||
&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&\\&&&
|
||||
\end{tabularx}}
|
||||
|
||||
\newcommand{\money}[1]{\chapter{Money to be paid to #1} {\small Please enter
|
||||
each transaction only once in this book; either a positive credit to one
|
||||
account, or a negative debit to another. Record the currency for each
|
||||
entry.}\bigskip\\
|
||||
\moneytable\newpage\moneytabletwo}
|
||||
|
||||
\begin{document}
|
||||
|
||||
\newfont{\gothic}{ygoth scaled \magstep5}
|
||||
\thispagestyle{empty}
|
||||
\begin{center}
|
||||
\ \vspace{3cm}\\
|
||||
{\Large Cambridge University Caving Club}\bigskip\\
|
||||
\vspace{5mm}
|
||||
{\Huge \bf Expo 2008}\\
|
||||
\vspace{2cm}
|
||||
{\Huge \sc \gothic Bier Book}\\
|
||||
\vspace{4cm}
|
||||
\fbox{\quad\parbox{9.5cm}{\begin{center}\large Outstanding Bier Book entries
|
||||
must reach \\
|
||||
Kathryn Hopkins (\url{kh311@cam.ac.uk}) \\
|
||||
by 14\textsuperscript{th} September at the very latest.
|
||||
\end{center}}\quad}
|
||||
\vfill
|
||||
\end{center}
|
||||
|
||||
\newpage
|
||||
|
||||
%\ \vspace{12cm}\\
|
||||
%Revision 7: June 2007.
|
||||
\ \newpage
|
||||
|
||||
\tableofcontents
|
||||
|
||||
\newpage
|
||||
|
||||
\chapter{Bier Tally (1-50)}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{More Bier (51-100)}
|
||||
\setcounter{gridstart}{50}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
%\chapter{More More Bier (101-150)}
|
||||
%\setcounter{gridstart}{100}
|
||||
|
||||
%\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{Limo Tally (1-50)}
|
||||
\setcounter{gridstart}{0}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{More Limo (51-100)}
|
||||
\setcounter{gridstart}{50}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
%\chapter{Battery Tally (1-50)}
|
||||
%
|
||||
%{\bf /} = AA battery; {\bf +} = AAA battery
|
||||
%
|
||||
%\setcounter{gridstart}{0}
|
||||
%
|
||||
%\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{Notable Farts}
|
||||
\setcounter{gridstart}{0}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{Number of Showers}
|
||||
\setcounter{gridstart}{0}
|
||||
|
||||
\tallya
|
||||
|
||||
%tallyb
|
||||
|
||||
\chapter{Expo Transport}
|
||||
\transporttable
|
||||
|
||||
\transporttable
|
||||
|
||||
\chapter{Nights Tally (weeks 1 and 2)}
|
||||
|
||||
{\small {\bf /} = Base Camp; {\bf S} = Stone Bridge; {\bf B} = bivvying elsewhere.}
|
||||
|
||||
\datetallyfirsta
|
||||
|
||||
%\datetallyfirstb
|
||||
|
||||
\chapter{Nights Tally (weeks 3 and 4)}
|
||||
|
||||
{\small {\bf /} = Base Camp; {\bf S} = Stone Bridge; {\bf B} = bivvying elsewhere.}
|
||||
|
||||
\datetallyseconda
|
||||
|
||||
%\datetallysecondb
|
||||
|
||||
%\chapter{Nights Tally (weeks 5 and 6)}
|
||||
%
|
||||
%{\small {\bf /} = Base Camp; {\bf S} = Stone Bridge; {\bf E} = Eislufthoehle; {\bf B} = bivvying elsewhere.}
|
||||
%
|
||||
%\datetallythirda
|
||||
%
|
||||
%\datetallythirdb
|
||||
|
||||
\chapter{Time Underground Tally (weeks 1 and 2)}
|
||||
|
||||
\datetallyfirsta
|
||||
|
||||
%\datetallyfirstb
|
||||
|
||||
\chapter{Time Underground Tally (weeks 3 and 4)}
|
||||
|
||||
\datetallyseconda
|
||||
|
||||
%\datetallysecondb
|
||||
|
||||
%\chapter{Time Underground Tally (weeks 5 and 6)}
|
||||
%
|
||||
%\datetallythirda
|
||||
%
|
||||
%\datetallythirdb
|
||||
|
||||
\chapter{Expo Weather}
|
||||
|
||||
\begin{tabularx}{\textwidth}{|l|X|}
|
||||
\hline
|
||||
Fri 18\textsuperscript{th} July & \\&\\\hline
|
||||
Sat 19\textsuperscript{th} July & \\&\\\hline
|
||||
Sun 20\textsuperscript{th} July & \\&\\\hline
|
||||
Mon 21\textsuperscript{st} July & \\&\\\hline
|
||||
Tue 22\textsuperscript{nd} July & \\&\\\hline
|
||||
Wed 23\textsuperscript{rd} July & \\&\\\hline
|
||||
Thu 24\textsuperscript{th} July & \\&\\\hline\hline
|
||||
|
||||
Fri 25\textsuperscript{th} July & \\&\\\hline
|
||||
Sat 26\textsuperscript{th} July & \\&\\\hline
|
||||
Sun 27\textsuperscript{th} July & \\&\\\hline
|
||||
Mon 28\textsuperscript{th} July & \\&\\\hline
|
||||
Tue 29\textsuperscript{th} July & \\&\\\hline
|
||||
Wed 30\textsuperscript{th} July & \\&\\\hline
|
||||
Thu 31\textsuperscript{st} July & \\&\\\hline
|
||||
|
||||
\end{tabularx}
|
||||
|
||||
\newpage
|
||||
|
||||
\begin{tabularx}{\textwidth}{|l|X|}
|
||||
\hline
|
||||
Fri 1\textsuperscript{st} August & \\&\\\hline
|
||||
Sat 2\textsuperscript{nd} August & \\&\\\hline
|
||||
Sun 3\textsuperscript{rd} August & \\&\\\hline
|
||||
Mon 4\textsuperscript{th} August & \\&\\\hline
|
||||
Tue 5\textsuperscript{th} August & \\&\\\hline
|
||||
Wed 6\textsuperscript{th} August & \\&\\\hline
|
||||
Thu 7\textsuperscript{th} August & \\&\\\hline\hline
|
||||
|
||||
Fri 8\textsuperscript{th} August & \\&\\\hline
|
||||
Sat 9\textsuperscript{th} August & \\&\\\hline
|
||||
Sun 10\textsuperscript{th} August & \\&\\\hline
|
||||
Mon 11\textsuperscript{th} August & \\&\\\hline
|
||||
Tue 12\textsuperscript{th} August & \\&\\\hline
|
||||
Wed 13\textsuperscript{th} August & \\&\\\hline
|
||||
Thu 14\textsuperscript{th} August & \\&\\\hline\hline
|
||||
|
||||
Fri 15\textsuperscript{th} August & \\&\\\hline
|
||||
Sat 16\textsuperscript{th} August & \\&\\\hline
|
||||
\end{tabularx}
|
||||
|
||||
\chapter{Toll Road Info}
|
||||
|
||||
%\chapter{Seshes at Staud'n'Wirt}
|
||||
%
|
||||
%{\bf Please record who ordered what, to save time in deciphering receipts
|
||||
%the morning after.}
|
||||
|
||||
%\newpage\ \newpage\ \newpage\ \newpage\
|
||||
%\newpage\ \newpage\ \newpage\
|
||||
|
||||
%\seshtable
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
%
|
||||
%\seshtabletwo
|
||||
|
||||
\chapter{In Austria Jollies}
|
||||
|
||||
Please record details of all excursions over 10km.\\
|
||||
|
||||
\inaustriatranstable
|
||||
|
||||
\inaustriatranstabletwo
|
||||
|
||||
\inaustriatranstabletwo
|
||||
|
||||
\inaustriatranstabletwo
|
||||
|
||||
\chapter{Squashed Flies Page}
|
||||
\newpage
|
||||
\ \newpage
|
||||
\money{Aaron}
|
||||
\money{Becka}
|
||||
\money{Djuke}
|
||||
\money{Edvin}
|
||||
\money{Frank}
|
||||
\money{Jess}
|
||||
\money{Julian}
|
||||
\money{Kathryn}
|
||||
\money{Mark}
|
||||
\money{Martin G}
|
||||
\money{Martin J}
|
||||
\money{Natalie}
|
||||
\money{Nial}
|
||||
\money{Olly M}
|
||||
\money{Ollie S}
|
||||
\money{Pete}
|
||||
\money{Serena}
|
||||
\money{Steve}
|
||||
\money{Tony}
|
||||
\money{Expo Kitty}
|
||||
\money{\ldots\ldots\ldots\ldots}
|
||||
\money{\ldots\ldots\ldots\ldots}
|
||||
|
||||
%\chapter{Contact Details and Medical Information}
|
||||
%
|
||||
%\section*{Aaron Curtis}
|
||||
%
|
||||
%Tulev\"{a}gen 5, Liding\"{o} 18132, SWEDEN. +468 767 5910.\\
|
||||
%{\tt ac511@cam.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Bert Curtis, address as above.\\
|
||||
%{\tt curtisbs@state.gov}, {\tt bertedits@gmail.com}
|
||||
%
|
||||
%\fbox{
|
||||
% \begin{minipage}{17em}
|
||||
% {\bf Possible mild allergy to sulpha drugs.}\\
|
||||
% Suffers from nosebleeds.
|
||||
%\end{minipage}}
|
||||
%
|
||||
%\section*{Chantalle Mouwer}
|
||||
%
|
||||
%\vspace{24ex}
|
||||
%
|
||||
%\section*{David Loeffler}
|
||||
%
|
||||
%69 Harcourt Road, Redland, Bristol, BS6 7RD. 0117 942 7516.\\
|
||||
%{\tt david.loeffler@imperial.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Liz \& Tom Loeffler, address as above.\\
|
||||
%{\tt liz.loeffler@bris.ac.uk}, {\tt tom.loeffler@bris.ac.uk}.
|
||||
%
|
||||
%\newpage\
|
||||
%
|
||||
%\section*{Jennifer Black}
|
||||
%
|
||||
%18 Vicar Road, Anfield, Liverpool, L6 0BW, UK. 0151 2224508.\\
|
||||
%{\tt jenny@liverpool.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Hilary \& Bob Black, 17 Viking Way, Corby, Northants, NN18
|
||||
%9DN. 01536 743108.\\
|
||||
%{\tt family\_black@hotmail.com}
|
||||
%
|
||||
%\fbox{
|
||||
% \begin{minipage}{23em}
|
||||
% {\bf Suffers from asthma.}\\
|
||||
% Medication: Ventolin inhaler, Flixotide 250 inhaler,\\
|
||||
% Singular (Montelukast) 10mg
|
||||
%\end{minipage}}
|
||||
%
|
||||
%\section*{John Billings}
|
||||
%
|
||||
%Queens' College, Cambridge, CB3 9ET. 07814 950547.\\
|
||||
%{\tt John.Billings@cl.cam.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Anna \& Peter Billings, 28 St. George's Crescent,
|
||||
%Queen's Park, Chester, Cheshire, CH4 7AR. 01244 675225.\\
|
||||
%{\tt anna.billings@zen.co.uk}, {\tt peter.billings@zen.co.uk}
|
||||
%
|
||||
%\section*{Mark Shinwell}
|
||||
%
|
||||
%48 Panton Street, Cambridge, CB2 1HS. 07725 234383.\\ {\tt mark@three-tuns.net}
|
||||
%
|
||||
%{\bf Next of kin:} Alan \& Chris Shinwell, The Tarns, Little Vigo,
|
||||
%Yateley, Hampshire, GU46 6ES. 01252 875986.
|
||||
%
|
||||
%\fbox{
|
||||
% \begin{minipage}{34em}
|
||||
% {\bf Occasional use of simeticone and/or mebeverine hydrochloride to treat
|
||||
% stress-induced abdominal cramps.}
|
||||
%\end{minipage}}
|
||||
%
|
||||
%\newpage
|
||||
%
|
||||
%\section*{Matthew Bent}
|
||||
%
|
||||
%135 Garstang Road, Fulwood, Preston, PR2 3EB. 01772 715854.\\
|
||||
%{\tt matt\_bentuk@yahoo.co.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Robert Bent, address as above.
|
||||
%
|
||||
%\section*{Oliver Betts}
|
||||
%
|
||||
%18 Vicar Road, Liverpool, L6 0BW, UK. 0151 2224508.\\
|
||||
%{\tt olly@survex.com}
|
||||
%
|
||||
%{\bf Next of kin:} Terry Betts (father), 24 Morgans Road, Hertford,
|
||||
%Herts, SG13 8BS. 01992 583643.\\
|
||||
%{\tt terry@tjb-planning.co.uk}
|
||||
%
|
||||
%\fbox{\bf Possible penicillin allergy.}
|
||||
%
|
||||
%\section*{Peter Harley}
|
||||
%
|
||||
%27, Grosvenor Gardens, Billericay, Essex, CM12 0UF. 01277 625102.\\
|
||||
%{\tt pjrh2@cam.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Chris Harley, address as above.\\
|
||||
%{\tt chris.harley@btinternet.com}
|
||||
%
|
||||
%\section*{Philip Underwood}
|
||||
%
|
||||
%16 Sycamore Road, Brookhouse, Lancaster, LA2 9PB. 0773 928 5952.\\
|
||||
%{\tt phil@furbrain.org.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Betty Underwood, 25 Greetby Hill, Ormskirk, Lancashire,
|
||||
%L39 2DP. 01695 576229.\\
|
||||
%
|
||||
%\fbox{
|
||||
% \begin{minipage}{23em}
|
||||
% {\bf Suffers from asthma.}\\
|
||||
% Can take all drugs including non-steroidals.
|
||||
% \end{minipage}}
|
||||
%
|
||||
%\section*{Sandeep Mavadia}
|
||||
%
|
||||
%32 Elmbridge Drive, Shirley, West Midlands, B90 4YP. 0121 745 8468.\\
|
||||
%{\tt smavadia@gmail.com}
|
||||
%
|
||||
%{\bf Next of kin:} Kalpana Mavadia, address as above.
|
||||
%
|
||||
%\section*{Tomas Handford}
|
||||
%
|
||||
%45 Park Avenue, Cheadle Hulme, Cheadle, Cheshire, SK8 6EU. 0161 485 3693.\\
|
||||
%{\tt tph32@cam.ac.uk}
|
||||
%
|
||||
%{\bf Next of kin:} Address as above.
|
||||
|
||||
\chapter{Gear taken up to the Stone Bridge}
|
||||
|
||||
\newpage\ \newpage\ \newpage\ \newpage
|
||||
|
||||
%\chapter{Gear taken up to the 76 Bivi}
|
||||
%
|
||||
%\newpage\ \newpage
|
||||
|
||||
\chapter{Stuff NOT to be left in Austria}
|
||||
To be filled in at the end of the expedition.
|
||||
|
||||
\newpage\ \newpage\ \newpage
|
||||
|
||||
\chapter{Stuff left in Austria}
|
||||
|
||||
Please use the logbook as there is more space.
|
||||
|
||||
\chapter{Expo Suggestions}
|
||||
|
||||
\newpage\ \newpage\ \newpage\
|
||||
|
||||
\chapter{Quotes}
|
||||
|
||||
\newpage\ \newpage\ \newpage\ \newpage\ \newpage \ \newpage
|
||||
|
||||
\appendix
|
||||
|
||||
\chapter{Accounting Policy}
|
||||
|
||||
\emph{May 2008}
|
||||
|
||||
This policy is intended as a guide to how we intend to manage Expo costs and
|
||||
income. We (Ollie Stevens \& Kathryn Hopkins) reserve the right to alter the
|
||||
policy or make exceptions to it where the policy proves unworkable or conflicts
|
||||
with the aims listed below.
|
||||
|
||||
The Expo Treasurer, Kathryn Hopkins (\url{kh311@cam.ac.uk}), will manage the
|
||||
finances. Any queries or complaints should in the first place be addressed
|
||||
directly to her. If you are dissatisfied, the sole other point of authority is
|
||||
Ollie Stevens (\url{oacs2@cam.ac.uk}), Expo Leader. By attending Expo you
|
||||
undertake to submit all claims for reimbursement by the 14th September. Claims
|
||||
submitted after this date may not be reimbursed. A bill, as agreed by Kathryn
|
||||
and Ollie, will be issued by 1st October, which you are expected to settle
|
||||
before 1st November.
|
||||
|
||||
\section{Aims}
|
||||
|
||||
\begin{itemize}
|
||||
\item To finance a successful 2008 expedition.
|
||||
\item To leave a float of \pounds600 for the 2009 expedition.
|
||||
\item To deliver Expo at an acceptable cost to participants.
|
||||
\item To generate transparent records.
|
||||
\item To split costs as fairly as is reasonably practicable.
|
||||
\end{itemize}
|
||||
|
||||
\section{The Bierbook}
|
||||
|
||||
Newcomers to Expo are introduced to the Bierbook. This venerable tome is used
|
||||
to record when money is spent, when the results of such spending are used and
|
||||
much other important information. Please acquaint yourself to the Bierbook when
|
||||
you get a chance and use it fastidiously. For example, upon removing a beer
|
||||
from the fridge, note it in your tally.
|
||||
|
||||
A new addition introduced last year is the Seshbook. This can be taken away to
|
||||
record drinks or meal purchases.
|
||||
|
||||
Note that `swaps' between participants can be made via the Bierbook. For
|
||||
example, the lending of cash.
|
||||
|
||||
\section{Funding}
|
||||
|
||||
Several thousand pounds of grant money has been awarded to Expo. The majority
|
||||
of this arises from bids made specifically for scientific equipment and will
|
||||
therefore be spent on these items. The rest will be used towards caving
|
||||
equipment expenses, such as the Expo rope order. Grant money will therefore
|
||||
subsidise caving aims.
|
||||
|
||||
Those attending will be expected to make their share of purchases on behalf of
|
||||
Expo. Such purchases are noted in the Bierbook, so that payments between cavers
|
||||
can be arranged after Expo to ensure that everyone has paid their fair share.
|
||||
Please keep your receipts! You will be expected to submit these after Expo for
|
||||
all purchases over \pounds100 and you may be asked for receipts of under this
|
||||
boundary too. We cannot guarantee to reimburse expenses if receipts are not
|
||||
forthcoming. Some large purchases will need to be split between cavers, or paid
|
||||
for by Expo centrally. This central money arises from \pounds120 deposits.
|
||||
|
||||
Large purchases expected include gear order(s), ferry crossings and the
|
||||
campsite. Deposit money is being used to cover gear, and some of the campsite
|
||||
fee.
|
||||
|
||||
Attendees are asked to note that Expo does not guarantee to reimburse costs
|
||||
that have not first been agreed with the Expo Treasurer, even where this
|
||||
document lists a cost as reimbursable. In practice, all reasonable necessities
|
||||
will be reimbursed, but for payments of several hundred pounds and over,
|
||||
permission in advance is best sought.
|
||||
|
||||
\section{Transport To \& From Expo}
|
||||
|
||||
Cars can qualify as `serving Expo' for their outward journey and/or for their
|
||||
return journey. To achieve outward and/or return `serving Expo' status, the car
|
||||
will generally be transporting:
|
||||
|
||||
\begin{itemize}
|
||||
\item Three or more Expo attendees (includes driver) for a significant portion of the journey(s).
|
||||
|
||||
\item Or; two or more Expo attendees (includes driver), plus an appreciable
|
||||
quantity of communal equipment or others' personal equipment for a significant
|
||||
portion of the journey(s).
|
||||
\end{itemize}
|
||||
|
||||
Cars that fail to meet these criteria may also be considered to be `serving
|
||||
expo' at the discretion of the expedition treasurer. For example, a car
|
||||
arriving late in expo may not be able to carry its full quota of expo gear,
|
||||
because most gear would already be in Austria by that time. Such a car may be
|
||||
considered to be serving expo if it carried only 2 people and a small amount of
|
||||
gear.
|
||||
|
||||
Cars serving Expo will have all fuel and ferry costs reimbursed by Expo for
|
||||
that journey, so long as an acceptably direct route is taken. In addition,
|
||||
where the car is `serving Expo' both ways, Expo will pay for breakdown cover
|
||||
and insurance costs associated with taking the vehicle abroad. Where you buy
|
||||
yearly cover or there is some other complication, please contact Kathryn
|
||||
Hopkins to discuss how much will be reimbursed. Costs of expended equipment,
|
||||
such as single use headlamp deflectors, can also be charged to Expo.
|
||||
|
||||
Where the car is `serving Expo' in one direction only, Expo will pay three
|
||||
fifths of the breakdown cover and insurance costs associated with taking the
|
||||
vehicle abroad and half of the ferry fare.
|
||||
|
||||
Car owners are expected to deliver receipts in order to claim these costs.
|
||||
Where breakdown or other insurance is not purchased and something goes wrong,
|
||||
the car owner is responsible (organisationally and financially) for
|
||||
transporting passengers and Expo gear to the appropriate destinations.
|
||||
|
||||
In addition, car owners are entitled to a \pounds25 wear-and-tear payment for
|
||||
each direction their car is ‘serving Expo’ over. No toll payments will be
|
||||
reimbursed, as car travellers do have the option of using cheaper roads.
|
||||
|
||||
Expo attendees who are forced to fly from the UK because of lack of car space
|
||||
will also be reimbursed by expo for the price of their plane tickets.
|
||||
|
||||
\section{Payments to Car Owners: Transport Within Austria}
|
||||
|
||||
Where a journey is considered as `serving Expo' (this will generally involve
|
||||
transporting people for caving or doing a task on behalf of Expo as a whole),
|
||||
rather than being private, its fuel cost will be reimbursed. Where a toll road
|
||||
or car park is used and there is no practicable alternative, the toll or
|
||||
parking fee will also be reimbursed.
|
||||
|
||||
In order to distinguish how much fuel is used `serving Expo' and how much fuel
|
||||
is used on other trips, please record `Jollies' in the appropriate Bierbook
|
||||
section and charge all fuel costs via the fuel buyer’s section.
|
||||
|
||||
In addition, for each week in which journeys `serving Expo' are made, a
|
||||
\pounds5 wearand-tear payment will be made to the car owner. Some insurance and
|
||||
breakdown cover reimbursements may be made, even if the car is not serving Expo
|
||||
to or from Austria.
|
||||
|
||||
\section{Contributions to Travel Expenses}
|
||||
|
||||
The pooled transport to and from Expo will be billed across the Expo
|
||||
participants. The share assigned to each person will depend on his/her use of
|
||||
Expo transport to get his/her person and gear to Austria. Even those not using
|
||||
Expo pooled transport at all will pay a small share, owing to the need to
|
||||
transport communal gear to Austria.
|
||||
|
||||
Those taking more than two Inglesport/Bernie's sized bags of personal gear via
|
||||
pooled transport may be charged an extra fee. Equipment being used for Expo’s
|
||||
stated cave science aims will be treated as communal rather than personal
|
||||
equipment. Please do not bring expendable things to Expo that could just as
|
||||
easily be bought there -- such as many food items.
|
||||
|
||||
Reasonable transport costs within Austria will be pooled across all
|
||||
participants proportionally to the length of time they spend at Expo. Expo does
|
||||
not pay fines.
|
||||
|
||||
\section{Contributions to Campsite Fees, Individual Excursions, Food}
|
||||
|
||||
Many items such as campsite fees and excursions will be split directly
|
||||
according to the benefit attendees gained -- so there will be a rate for each
|
||||
night at base camp and the charge will be calculated from this and the number
|
||||
of nights you spent there. Please therefore note things like bier consumption
|
||||
in the Bierbook.
|
||||
|
||||
Basic camping expenses, such as meals and bog roll, will be included in one
|
||||
overall bill that is split depending on the number of nights spent at Expo.
|
||||
This will be independent of whether time was spent at base or top camp.
|
||||
Communal equipment and miscellaneous items will be split similarly. The amount
|
||||
of caving done by an attendee has no bearing on the amount charged them. Note
|
||||
that only a basic level of nutrition is paid for by Expo and that `luxury'
|
||||
foods on top of this should be individually paid for.
|
||||
|
||||
\section{Sponsorship in Kind}
|
||||
|
||||
Where companies donate products to Expo, the products will either be
|
||||
`communal', `free-for-all personal' or `charged personal'.
|
||||
|
||||
\begin{itemize}
|
||||
\item `Communal' items are shared by all and will be items such
|
||||
as surveying equipment. These items will remain under the ownership of Expo.
|
||||
|
||||
\item `Free-for-all personal' items will be shared amongst all Expo attendees
|
||||
in some manner, fair or otherwise. A Tunnocks bar is an example of such an
|
||||
item.
|
||||
|
||||
\item Expo will own `charged personal' items until they sold to attendees.
|
||||
Typical sales price will be 50\% of a UK price for that item and the revenue
|
||||
generated will be used to subsidise attendees based on the number of nights
|
||||
they spend at Expo.
|
||||
\end{itemize}
|
||||
|
||||
A condition of making use of sponsored items is that you ensure photos are made
|
||||
available of the items in use, to be sent to our sponsors. In addition, you may
|
||||
be asked to write a short review of the item.
|
||||
|
||||
\section{The Euro}
|
||||
|
||||
Sterling/Euro conversions will be performed using an average of several
|
||||
attendees' credit card conversion rates covering the expo period.
|
||||
|
||||
\section{Other}
|
||||
|
||||
Expo does not pay any photographic costs, unless the Expo Leader specifically
|
||||
calls for the photography. For example, Expo may pay for photographs of
|
||||
equipment provided by sponsors. Copies of all such photographs must be provided
|
||||
to Expo and Expo has the right to reproduce these photographs.
|
||||
|
||||
Expo carbide is provided for free to attendees, on condition that users dispose
|
||||
of spent carbide in a timely and environmentally sensitive manner.
|
||||
|
||||
Individuals kindly allowing their stoves to be used communally may charge Expo
|
||||
for any replacement parts caused by the rigours of Expo use. Those using
|
||||
others' stoves are requested to be careful with them.
|
||||
|
||||
Note that where something is paid for and its cost cannot after the event be
|
||||
split between attendees without disagreement (e.g. a heavy sesh), the cost will
|
||||
be left with the person who paid the bill. He or she is asked to settle such
|
||||
debts with other attendees outside of the Expo accounting system.
|
||||
|
||||
\end{document}
|
||||
733
bierbook/book.tex
Normal file
733
bierbook/book.tex
Normal file
@ -0,0 +1,733 @@
|
||||
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
|
||||
\ProvidesClass{bb}
|
||||
[2001/08/02 v1.0
|
||||
Bier Book class]
|
||||
\DeclareFixedFont{\titlefont}{OT1}{phv}{b}{n}{36pt}
|
||||
\DeclareFixedFont{\aftertitlefont}{OT1}{phv}{m}{n}{10pt}
|
||||
\DeclareFixedFont{\titlepagefont}{OT1}{phv}{b}{n}{19pt}
|
||||
\DeclareFixedFont{\titlepagefontm}{OT1}{phv}{m}{n}{15pt}
|
||||
\DeclareFixedFont{\titlepagefontms}{OT1}{phv}{m}{n}{13pt}
|
||||
\DeclareFixedFont{\titlepagefonts}{OT1}{phv}{m}{n}{12pt}
|
||||
\DeclareFixedFont{\chapterfont}{OT1}{phv}{b}{n}{16pt}
|
||||
\DeclareFixedFont{\chapterfontnonbold}{OT1}{phv}{m}{n}{16pt}
|
||||
\DeclareFixedFont{\sectionfont}{OT1}{phv}{b}{n}{14pt}
|
||||
\DeclareFixedFont{\subsectionfont}{OT1}{phv}{m}{n}{12pt}
|
||||
\DeclareFixedFont{\subsubsectionfont}{OT1}{phv}{m}{n}{11pt}
|
||||
|
||||
\newcommand\@ptsize{}
|
||||
\newif\if@restonecol
|
||||
\newif\if@titlepage
|
||||
\@titlepagetrue
|
||||
\newif\if@openright
|
||||
\if@compatibility\else
|
||||
\DeclareOption{a4paper}
|
||||
{\setlength\paperheight {297mm}%
|
||||
\setlength\paperwidth {210mm}}
|
||||
\DeclareOption{a5paper}
|
||||
{\setlength\paperheight {210mm}%
|
||||
\setlength\paperwidth {148mm}}
|
||||
\DeclareOption{b5paper}
|
||||
{\setlength\paperheight {250mm}%
|
||||
\setlength\paperwidth {176mm}}
|
||||
\DeclareOption{letterpaper}
|
||||
{\setlength\paperheight {11in}%
|
||||
\setlength\paperwidth {8.5in}}
|
||||
\DeclareOption{legalpaper}
|
||||
{\setlength\paperheight {14in}%
|
||||
\setlength\paperwidth {8.5in}}
|
||||
\DeclareOption{executivepaper}
|
||||
{\setlength\paperheight {10.5in}%
|
||||
\setlength\paperwidth {7.25in}}
|
||||
\DeclareOption{landscape}
|
||||
{\setlength\@tempdima {\paperheight}%
|
||||
\setlength\paperheight {\paperwidth}%
|
||||
\setlength\paperwidth {\@tempdima}}
|
||||
\fi
|
||||
\if@compatibility
|
||||
\renewcommand\@ptsize{0}
|
||||
\else
|
||||
\DeclareOption{10pt}{\renewcommand\@ptsize{0}}
|
||||
\fi
|
||||
\DeclareOption{11pt}{\renewcommand\@ptsize{1}}
|
||||
\DeclareOption{12pt}{\renewcommand\@ptsize{2}}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse}
|
||||
\fi
|
||||
\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue}
|
||||
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{final}{\setlength\overfullrule{0pt}}
|
||||
\fi
|
||||
\DeclareOption{titlepage}{\@titlepagetrue}
|
||||
\if@compatibility\else
|
||||
\DeclareOption{notitlepage}{\@titlepagefalse}
|
||||
\fi
|
||||
\if@compatibility
|
||||
\else
|
||||
\DeclareOption{openright}{\@openrighttrue}
|
||||
\DeclareOption{openany}{\@openrightfalse}
|
||||
\fi
|
||||
\if@compatibility\else
|
||||
\DeclareOption{onecolumn}{\@twocolumnfalse}
|
||||
\fi
|
||||
\DeclareOption{twocolumn}{\@twocolumntrue}
|
||||
\DeclareOption{leqno}{\input{leqno.clo}}
|
||||
\DeclareOption{fleqn}{\input{fleqn.clo}}
|
||||
\DeclareOption{openbib}{%
|
||||
\AtEndOfPackage{%
|
||||
\renewcommand\@openbib@code{%
|
||||
\advance\leftmargin\bibindent
|
||||
\itemindent -\bibindent
|
||||
\listparindent \itemindent
|
||||
\parsep \z@
|
||||
}%
|
||||
\renewcommand\newblock{\par}}%
|
||||
}
|
||||
\ExecuteOptions{letterpaper,10pt,oneside,onecolumn,final,openany}
|
||||
\ProcessOptions
|
||||
\input{size1\@ptsize.clo}
|
||||
\setlength\lineskip{1\p@}
|
||||
\setlength\normallineskip{1\p@}
|
||||
\renewcommand\baselinestretch{}
|
||||
\setlength\parskip{0\p@ \@plus \p@}
|
||||
\@lowpenalty 51
|
||||
\@medpenalty 151
|
||||
\@highpenalty 301
|
||||
\setcounter{topnumber}{2}
|
||||
\renewcommand\topfraction{.7}
|
||||
\setcounter{bottomnumber}{1}
|
||||
\renewcommand\bottomfraction{.3}
|
||||
\setcounter{totalnumber}{3}
|
||||
\renewcommand\textfraction{.2}
|
||||
\renewcommand\floatpagefraction{.5}
|
||||
\setcounter{dbltopnumber}{2}
|
||||
\renewcommand\dbltopfraction{.7}
|
||||
\renewcommand\dblfloatpagefraction{.5}
|
||||
\if@twoside
|
||||
\def\ps@headings{%
|
||||
\let\@oddfoot\@empty\let\@evenfoot\@empty
|
||||
\def\@evenhead{\thepage\hfil\slshape\leftmark}%
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\markboth
|
||||
\def\chaptermark##1{%
|
||||
\markboth {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
\@chapapp\ \thechapter. \ %
|
||||
\fi
|
||||
##1}}{}}%
|
||||
\def\sectionmark##1{%
|
||||
\markright {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\z@
|
||||
\thesection. \ %
|
||||
\fi
|
||||
##1}}}}
|
||||
\else
|
||||
\def\ps@headings{%
|
||||
\let\@oddfoot\@empty
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\markboth
|
||||
\def\chaptermark##1{%
|
||||
\markright {\MakeUppercase{%
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
\@chapapp\ \thechapter. \ %
|
||||
\fi
|
||||
##1}}}}
|
||||
\fi
|
||||
\def\ps@myheadings{%
|
||||
\let\@oddfoot\@empty\let\@evenfoot\@empty
|
||||
\def\@evenhead{\thepage\hfil\slshape\leftmark}%
|
||||
\def\@oddhead{{\slshape\rightmark}\hfil\thepage}%
|
||||
\let\@mkboth\@gobbletwo
|
||||
\let\chaptermark\@gobble
|
||||
\let\sectionmark\@gobble
|
||||
}
|
||||
\if@titlepage
|
||||
\newcommand\maketitle{\begin{titlepage}%
|
||||
\let\footnotesize\small
|
||||
\let\footnoterule\relax
|
||||
\let \footnote \thanks
|
||||
\null\vfil
|
||||
\vskip 60\p@
|
||||
\begin{center}%
|
||||
{\LARGE \@title \par}%
|
||||
\vskip 3em%
|
||||
{\large
|
||||
\lineskip .75em%
|
||||
\begin{tabular}[t]{c}%
|
||||
\@author
|
||||
\end{tabular}\par}%
|
||||
\vskip 1.5em%
|
||||
{\large \@date \par}% % Set date in \large size.
|
||||
\end{center}\par
|
||||
\@thanks
|
||||
\vfil\null
|
||||
\end{titlepage}%
|
||||
\setcounter{footnote}{0}%
|
||||
\global\let\thanks\relax
|
||||
\global\let\maketitle\relax
|
||||
\global\let\@thanks\@empty
|
||||
\global\let\@author\@empty
|
||||
\global\let\@date\@empty
|
||||
\global\let\@title\@empty
|
||||
\global\let\title\relax
|
||||
\global\let\author\relax
|
||||
\global\let\date\relax
|
||||
\global\let\and\relax
|
||||
}
|
||||
\else
|
||||
\newcommand\maketitle{\par
|
||||
\begingroup
|
||||
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
|
||||
\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
|
||||
\long\def\@makefntext##1{\parindent 1em\noindent
|
||||
\hb@xt@1.8em{%
|
||||
\hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
|
||||
\if@twocolumn
|
||||
\ifnum \col@number=\@ne
|
||||
\@maketitle
|
||||
\else
|
||||
\twocolumn[\@maketitle]%
|
||||
\fi
|
||||
\else
|
||||
\newpage
|
||||
\global\@topnum\z@ % Prevents figures from going at top of page.
|
||||
\@maketitle
|
||||
\fi
|
||||
\thispagestyle{plain}\@thanks
|
||||
\endgroup
|
||||
\setcounter{footnote}{0}%
|
||||
\global\let\thanks\relax
|
||||
\global\let\maketitle\relax
|
||||
\global\let\@maketitle\relax
|
||||
\global\let\@thanks\@empty
|
||||
\global\let\@author\@empty
|
||||
\global\let\@date\@empty
|
||||
\global\let\@title\@empty
|
||||
\global\let\title\relax
|
||||
\global\let\author\relax
|
||||
\global\let\date\relax
|
||||
\global\let\and\relax
|
||||
}
|
||||
\def\@maketitle{%
|
||||
\newpage
|
||||
\null
|
||||
\vskip 2em%
|
||||
\begin{center}%
|
||||
\let \footnote \thanks
|
||||
{\LARGE \@title \par}%
|
||||
\vskip 1.5em%
|
||||
{\large
|
||||
\lineskip .5em%
|
||||
\begin{tabular}[t]{c}%
|
||||
\@author
|
||||
\end{tabular}\par}%
|
||||
\vskip 1em%
|
||||
{\large \@date}%
|
||||
\end{center}%
|
||||
\par
|
||||
\vskip 1.5em}
|
||||
\fi
|
||||
\newcommand*\chaptermark[1]{}
|
||||
\setcounter{secnumdepth}{2}
|
||||
\newcounter {part}
|
||||
\newcounter {chapter}
|
||||
\newcounter {section}[chapter]
|
||||
\newcounter {subsection}[section]
|
||||
\newcounter {subsubsection}[subsection]
|
||||
\newcounter {paragraph}[subsubsection]
|
||||
\newcounter {subparagraph}[paragraph]
|
||||
\renewcommand \thepart {\@Roman\c@part}
|
||||
\renewcommand \thechapter {\@arabic\c@chapter}
|
||||
\renewcommand \thesection {\thechapter.\@arabic\c@section}
|
||||
\renewcommand\thesubsection {\thesection.\@arabic\c@subsection}
|
||||
\renewcommand\thesubsubsection{\thesubsection .\@arabic\c@subsubsection}
|
||||
\renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph}
|
||||
\renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}
|
||||
\newcommand\@chapapp{\chaptername}
|
||||
\newcommand\part{%
|
||||
\if@openright
|
||||
\cleardoublepage
|
||||
\else
|
||||
\clearpage
|
||||
\fi
|
||||
\thispagestyle{plain}%
|
||||
\if@twocolumn
|
||||
\onecolumn
|
||||
\@tempswatrue
|
||||
\else
|
||||
\@tempswafalse
|
||||
\fi
|
||||
\null\vfil
|
||||
\secdef\@part\@spart}
|
||||
|
||||
\def\@part[#1]#2{%
|
||||
\ifnum \c@secnumdepth >-2\relax
|
||||
\refstepcounter{part}%
|
||||
\addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{part}{#1}%
|
||||
\fi
|
||||
\markboth{}{}%
|
||||
{\centering
|
||||
\interlinepenalty \@M
|
||||
\normalfont
|
||||
\ifnum \c@secnumdepth >-2\relax
|
||||
\huge\bfseries \partname~\thepart
|
||||
\par
|
||||
\vskip 20\p@
|
||||
\fi
|
||||
\Huge \bfseries #2\par}%
|
||||
\@endpart}
|
||||
\def\@spart#1{%
|
||||
{\centering
|
||||
\interlinepenalty \@M
|
||||
\normalfont
|
||||
\Huge \bfseries #1\par}%
|
||||
\@endpart}
|
||||
\def\@endpart{\vfil\newpage
|
||||
\if@twoside
|
||||
\null
|
||||
\thispagestyle{empty}%
|
||||
\newpage
|
||||
\fi
|
||||
\if@tempswa
|
||||
\twocolumn
|
||||
\fi}
|
||||
\newcommand\chapter{\if@openright\cleardoublepage\else\clearpage\fi
|
||||
\thispagestyle{plain}%
|
||||
\global\@topnum\z@
|
||||
\@afterindentfalse
|
||||
\secdef\@chapter\@schapter}
|
||||
\newcommand\chapternotoc{\if@openright\cleardoublepage\else\clearpage\fi
|
||||
\thispagestyle{plain}%
|
||||
\global\@topnum\z@
|
||||
\@afterindentfalse
|
||||
\secdef\@chapternotoc\@schapter}
|
||||
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
|
||||
\refstepcounter{chapter}%
|
||||
\typeout{\@chapapp\space\thechapter.}%
|
||||
\addcontentsline{toc}{chapter}%
|
||||
{\protect\numberline{\thechapter}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{chapter}{#1}%
|
||||
\fi
|
||||
\chaptermark{#1}%
|
||||
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||
\if@twocolumn
|
||||
\@topnewpage[\@makechapterhead{#2}]%
|
||||
\else
|
||||
\@makechapterhead{#2}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@chapternotoc[#1]#2{\ifnum \c@secnumdepth >\m@ne
|
||||
\refstepcounter{chapter}%
|
||||
\typeout{\@chapapp\space\thechapter.}%
|
||||
%% \addcontentsline{toc}{chapter}%
|
||||
%% {\protect\numberline{\thechapter}#1}%
|
||||
\else
|
||||
\addcontentsline{toc}{chapter}{#1}%
|
||||
\fi
|
||||
\chaptermark{#1}%
|
||||
\addtocontents{lof}{\protect\addvspace{10\p@}}%
|
||||
\addtocontents{lot}{\protect\addvspace{10\p@}}%
|
||||
\if@twocolumn
|
||||
\@topnewpage[\@makechapterhead{#2}]%
|
||||
\else
|
||||
\@makechapterhead{#2}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@makechapterhead#1{%
|
||||
%% \vspace*{2\p@}%
|
||||
{\parindent \z@ \raggedright \normalfont
|
||||
\ifnum \c@secnumdepth >\m@ne
|
||||
%% \hrulefill
|
||||
%% \vskip 2\p@
|
||||
%% \chapterfontnonbold \@chapapp\space \psshadowbox[linecolor=white]{\parbox{2.5cm}{\thechapter}}\ --\ %
|
||||
%% \chapterfontnonbold\psshadowbox{\parbox[t][1.2cm][c]{1.2cm}{\begin{center}\thechapter\end{center}}} \space\space
|
||||
%% \par\nobreak
|
||||
%% \vskip 20\p@
|
||||
\fi
|
||||
%% \interlinepenalty\@M
|
||||
\parbox[t][1.2cm][c]{\textwidth}{\vfill\chapterfont #1 \vfill}
|
||||
|
||||
\vskip 12\p@
|
||||
%% \hrulefill\\
|
||||
%% \vskip 40\p@
|
||||
}}
|
||||
\def\@schapter#1{\if@twocolumn
|
||||
\@topnewpage[\@makeschapterhead{#1}]%
|
||||
\else
|
||||
\@makeschapterhead{#1}%
|
||||
\@afterheading
|
||||
\fi}
|
||||
\def\@makeschapterhead#1{%
|
||||
\vspace*{50\p@}%
|
||||
{\parindent \z@ \raggedright
|
||||
\normalfont
|
||||
\interlinepenalty\@M
|
||||
\chapterfont #1\par\nobreak
|
||||
\vskip 40\p@
|
||||
}}
|
||||
|
||||
\newcommand\section{\@startsection{section}{1}{0pt}{-3.5ex plus -1ex minus -.2ex}{2.3ex plus.2ex}{\sectionfont}}
|
||||
\newcommand\subsection{\@startsection{subsection}{2}{\z@}%
|
||||
{-3.25ex\@plus -1ex \@minus -.2ex}%
|
||||
{1.5ex \@plus .2ex}%
|
||||
{\subsectionfont}}
|
||||
\newcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
|
||||
{-3.25ex\@plus -1ex \@minus -.2ex}%
|
||||
{1.5ex \@plus .2ex}%
|
||||
{\subsubsectionfont}}
|
||||
\newcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
|
||||
{3.25ex \@plus1ex \@minus.2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}
|
||||
\newcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
|
||||
{3.25ex \@plus1ex \@minus .2ex}%
|
||||
{-1em}%
|
||||
{\normalfont\normalsize\bfseries}}
|
||||
\if@twocolumn
|
||||
\setlength\leftmargini {2em}
|
||||
\else
|
||||
\setlength\leftmargini {2.5em}
|
||||
\fi
|
||||
\leftmargin \leftmargini
|
||||
\setlength\leftmarginii {2.2em}
|
||||
\setlength\leftmarginiii {1.87em}
|
||||
\setlength\leftmarginiv {1.7em}
|
||||
\if@twocolumn
|
||||
\setlength\leftmarginv {.5em}
|
||||
\setlength\leftmarginvi {.5em}
|
||||
\else
|
||||
\setlength\leftmarginv {1em}
|
||||
\setlength\leftmarginvi {1em}
|
||||
\fi
|
||||
\setlength \labelsep {.5em}
|
||||
\setlength \labelwidth{\leftmargini}
|
||||
\addtolength\labelwidth{-\labelsep}
|
||||
\@beginparpenalty -\@lowpenalty
|
||||
\@endparpenalty -\@lowpenalty
|
||||
\@itempenalty -\@lowpenalty
|
||||
\renewcommand\theenumi{\@arabic\c@enumi}
|
||||
\renewcommand\theenumii{\@alph\c@enumii}
|
||||
\renewcommand\theenumiii{\@roman\c@enumiii}
|
||||
\renewcommand\theenumiv{\@Alph\c@enumiv}
|
||||
\newcommand\labelenumi{\theenumi.}
|
||||
\newcommand\labelenumii{(\theenumii)}
|
||||
\newcommand\labelenumiii{\theenumiii.}
|
||||
\newcommand\labelenumiv{\theenumiv.}
|
||||
\renewcommand\p@enumii{\theenumi}
|
||||
\renewcommand\p@enumiii{\theenumi(\theenumii)}
|
||||
\renewcommand\p@enumiv{\p@enumiii\theenumiii}
|
||||
\newcommand\labelitemi{\textbullet}
|
||||
\newcommand\labelitemii{\normalfont\bfseries \textendash}
|
||||
\newcommand\labelitemiii{\textasteriskcentered}
|
||||
\newcommand\labelitemiv{\textperiodcentered}
|
||||
\newenvironment{description}
|
||||
{\list{}{\labelwidth\z@ \itemindent-\leftmargin
|
||||
\let\makelabel\descriptionlabel}}
|
||||
{\endlist}
|
||||
\newcommand*\descriptionlabel[1]{\hspace\labelsep
|
||||
\normalfont\bfseries #1}
|
||||
\if@titlepage
|
||||
\newenvironment{abstract}{%
|
||||
\titlepage
|
||||
\null\vfil
|
||||
\@beginparpenalty\@lowpenalty
|
||||
\begin{center}%
|
||||
\bfseries \abstractname
|
||||
\@endparpenalty\@M
|
||||
\end{center}}%
|
||||
{\par\vfil\null\endtitlepage}
|
||||
\else
|
||||
\newenvironment{abstract}{%
|
||||
\if@twocolumn
|
||||
\section*{\abstractname}%
|
||||
\else
|
||||
\small
|
||||
\begin{center}%
|
||||
{\bfseries \abstractname\vspace{-.5em}\vspace{\z@}}%
|
||||
\end{center}%
|
||||
\quotation
|
||||
\fi}
|
||||
{\if@twocolumn\else\endquotation\fi}
|
||||
\fi
|
||||
\newenvironment{verse}
|
||||
{\let\\\@centercr
|
||||
\list{}{\itemsep \z@
|
||||
\itemindent -1.5em%
|
||||
\listparindent\itemindent
|
||||
\rightmargin \leftmargin
|
||||
\advance\leftmargin 1.5em}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\newenvironment{quotation}
|
||||
{\list{}{\listparindent 1.5em%
|
||||
\itemindent \listparindent
|
||||
\rightmargin \leftmargin
|
||||
\parsep \z@ \@plus\p@}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\newenvironment{quote}
|
||||
{\list{}{\rightmargin\leftmargin}%
|
||||
\item\relax}
|
||||
{\endlist}
|
||||
\if@compatibility
|
||||
\newenvironment{titlepage}
|
||||
{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse\newpage
|
||||
\fi
|
||||
\thispagestyle{empty}%
|
||||
\setcounter{page}\z@
|
||||
}%
|
||||
{\if@restonecol\twocolumn \else \newpage \fi
|
||||
}
|
||||
\else
|
||||
\newenvironment{titlepage}
|
||||
{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse\newpage
|
||||
\fi
|
||||
\thispagestyle{empty}%
|
||||
\setcounter{page}\@ne
|
||||
}%
|
||||
{\if@restonecol\twocolumn \else \newpage \fi
|
||||
\if@twoside\else
|
||||
\setcounter{page}\@ne
|
||||
\fi
|
||||
}
|
||||
\fi
|
||||
\newcommand\appendix{\par
|
||||
\setcounter{chapter}{0}%
|
||||
\setcounter{section}{0}%
|
||||
\gdef\@chapapp{\appendixname}%
|
||||
\gdef\thechapter{\@Alph\c@chapter}}
|
||||
\newcommand\afterappendix{\par
|
||||
\setcounter{chapter}{0}%
|
||||
\setcounter{section}{0}%
|
||||
\gdef\@chapapp{\chaptername}%
|
||||
\gdef\thechapter{\@arabic\c@chapter}}
|
||||
\setlength\arraycolsep{5\p@}
|
||||
\setlength\tabcolsep{6\p@}
|
||||
\setlength\arrayrulewidth{.4\p@}
|
||||
\setlength\doublerulesep{2\p@}
|
||||
\setlength\tabbingsep{\labelsep}
|
||||
\skip\@mpfootins = \skip\footins
|
||||
\setlength\fboxsep{3\p@}
|
||||
\setlength\fboxrule{.4\p@}
|
||||
\@addtoreset {equation}{chapter}
|
||||
\renewcommand\theequation
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation}
|
||||
\newcounter{figure}[chapter]
|
||||
\renewcommand \thefigure
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@figure}
|
||||
\def\fps@figure{tbp}
|
||||
\def\ftype@figure{1}
|
||||
\def\ext@figure{lof}
|
||||
\def\fnum@figure{\figurename~\thefigure}
|
||||
\newenvironment{figure}
|
||||
{\@float{figure}}
|
||||
{\end@float}
|
||||
\newenvironment{figure*}
|
||||
{\@dblfloat{figure}}
|
||||
{\end@dblfloat}
|
||||
\newcounter{table}[chapter]
|
||||
\renewcommand \thetable
|
||||
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@table}
|
||||
\def\fps@table{tbp}
|
||||
\def\ftype@table{2}
|
||||
\def\ext@table{lot}
|
||||
\def\fnum@table{\tablename~\thetable}
|
||||
\newenvironment{table}
|
||||
{\@float{table}}
|
||||
{\end@float}
|
||||
\newenvironment{table*}
|
||||
{\@dblfloat{table}}
|
||||
{\end@dblfloat}
|
||||
\newlength\abovecaptionskip
|
||||
\newlength\belowcaptionskip
|
||||
\setlength\abovecaptionskip{10\p@}
|
||||
\setlength\belowcaptionskip{0\p@}
|
||||
\long\def\@makecaption#1#2{%
|
||||
\vskip\abovecaptionskip
|
||||
\sbox\@tempboxa{#1: #2}%
|
||||
\ifdim \wd\@tempboxa >\hsize
|
||||
#1: #2\par
|
||||
\else
|
||||
\global \@minipagefalse
|
||||
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
|
||||
\fi
|
||||
\vskip\belowcaptionskip}
|
||||
\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
|
||||
\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
|
||||
\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
|
||||
\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
|
||||
\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
|
||||
\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
|
||||
\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
|
||||
\DeclareRobustCommand*\cal{\@fontswitch\relax\mathcal}
|
||||
\DeclareRobustCommand*\mit{\@fontswitch\relax\mathnormal}
|
||||
\newcommand\@pnumwidth{1.55em}
|
||||
\newcommand\@tocrmarg{2.55em}
|
||||
\newcommand\@dotsep{4.5}
|
||||
\setcounter{tocdepth}{2}
|
||||
\newcommand\tableofcontents{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\contentsname
|
||||
\@mkboth{%
|
||||
\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
|
||||
\@starttoc{toc}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\newcommand*\l@part[2]{%
|
||||
\ifnum \c@tocdepth >-2\relax
|
||||
\addpenalty{-\@highpenalty}%
|
||||
\addvspace{2.25em \@plus\p@}%
|
||||
\begingroup
|
||||
\parindent \z@ \rightskip \@pnumwidth
|
||||
\parfillskip -\@pnumwidth
|
||||
{\leavevmode
|
||||
\large \bfseries #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
|
||||
\nobreak
|
||||
\global\@nobreaktrue
|
||||
\everypar{\global\@nobreakfalse\everypar{}}%
|
||||
\endgroup
|
||||
\fi}
|
||||
\newcommand*\l@chapter[2]{%
|
||||
\ifnum \c@tocdepth >\m@ne
|
||||
\addpenalty{-\@highpenalty}%
|
||||
\vskip 1.0em \@plus\p@
|
||||
\setlength\@tempdima{1.5em}%
|
||||
\begingroup
|
||||
\parindent \z@ \rightskip \@pnumwidth
|
||||
\parfillskip -\@pnumwidth
|
||||
\leavevmode \bfseries
|
||||
\advance\leftskip\@tempdima
|
||||
\hskip -\leftskip
|
||||
#1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
|
||||
\penalty\@highpenalty
|
||||
\endgroup
|
||||
\fi}
|
||||
\newcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}}
|
||||
\newcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}}
|
||||
\newcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}}
|
||||
\newcommand*\l@paragraph{\@dottedtocline{4}{10em}{5em}}
|
||||
\newcommand*\l@subparagraph{\@dottedtocline{5}{12em}{6em}}
|
||||
\newcommand\listoffigures{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\listfigurename
|
||||
\@mkboth{\MakeUppercase\listfigurename}%
|
||||
{\MakeUppercase\listfigurename}}%
|
||||
\@starttoc{lof}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
|
||||
\newcommand\listoftables{%
|
||||
\if@twocolumn
|
||||
\@restonecoltrue\onecolumn
|
||||
\else
|
||||
\@restonecolfalse
|
||||
\fi
|
||||
\chapter*{\listtablename
|
||||
\@mkboth{%
|
||||
\MakeUppercase\listtablename}{\MakeUppercase\listtablename}}%
|
||||
\@starttoc{lot}%
|
||||
\if@restonecol\twocolumn\fi
|
||||
}
|
||||
\let\l@table\l@figure
|
||||
\newdimen\bibindent
|
||||
\setlength\bibindent{1.5em}
|
||||
\newenvironment{thebibliography}[1]
|
||||
{\chapter*{\bibname
|
||||
\@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}}%
|
||||
\list{\@biblabel{\@arabic\c@enumiv}}%
|
||||
{\settowidth\labelwidth{\@biblabel{#1}}%
|
||||
\leftmargin\labelwidth
|
||||
\advance\leftmargin\labelsep
|
||||
\@openbib@code
|
||||
\usecounter{enumiv}%
|
||||
\let\p@enumiv\@empty
|
||||
\renewcommand\theenumiv{\@arabic\c@enumiv}}%
|
||||
\sloppy
|
||||
\clubpenalty4000
|
||||
\@clubpenalty \clubpenalty
|
||||
\widowpenalty4000%
|
||||
\sfcode`\.\@m}
|
||||
{\def\@noitemerr
|
||||
{\@latex@warning{Empty `thebibliography' environment}}%
|
||||
\endlist}
|
||||
\newcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
|
||||
\let\@openbib@code\@empty
|
||||
\newenvironment{theindex}
|
||||
{\if@twocolumn
|
||||
\@restonecolfalse
|
||||
\else
|
||||
\@restonecoltrue
|
||||
\fi
|
||||
\columnseprule \z@
|
||||
\columnsep 35\p@
|
||||
\twocolumn[\@makeschapterhead{\indexname}]%
|
||||
\@mkboth{\MakeUppercase\indexname}%
|
||||
{\MakeUppercase\indexname}%
|
||||
\thispagestyle{plain}\parindent\z@
|
||||
\parskip\z@ \@plus .3\p@\relax
|
||||
\let\item\@idxitem}
|
||||
{\if@restonecol\onecolumn\else\clearpage\fi}
|
||||
\newcommand\@idxitem{\par\hangindent 40\p@}
|
||||
\newcommand\subitem{\@idxitem \hspace*{20\p@}}
|
||||
\newcommand\subsubitem{\@idxitem \hspace*{30\p@}}
|
||||
\newcommand\indexspace{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
|
||||
\renewcommand\footnoterule{%
|
||||
\kern-3\p@
|
||||
\hrule\@width.4\columnwidth
|
||||
\kern2.6\p@}
|
||||
\@addtoreset{footnote}{chapter}
|
||||
\newcommand\@makefntext[1]{%
|
||||
\parindent 1em%
|
||||
\noindent
|
||||
\hb@xt@1.8em{\hss\@makefnmark}#1}
|
||||
\newcommand\contentsname{Contents}
|
||||
\newcommand\listfigurename{List of Figures}
|
||||
\newcommand\listtablename{List of Tables}
|
||||
\newcommand\bibname{Bibliography}
|
||||
\newcommand\indexname{Index}
|
||||
\newcommand\figurename{Figure}
|
||||
\newcommand\tablename{Table}
|
||||
\newcommand\partname{Part}
|
||||
\newcommand\chaptername{Chapter}
|
||||
\newcommand\appendixname{Appendix}
|
||||
\newcommand\abstractname{Abstract}
|
||||
\def\today{\ifcase\month\or
|
||||
January\or February\or March\or April\or May\or June\or
|
||||
July\or August\or September\or October\or November\or December\fi
|
||||
\space\number\day, \number\year}
|
||||
\setlength\columnsep{10\p@}
|
||||
\setlength\columnseprule{0\p@}
|
||||
\pagestyle{plain}
|
||||
\pagenumbering{arabic}
|
||||
\if@twoside
|
||||
\else
|
||||
\raggedbottom
|
||||
\fi
|
||||
\if@twocolumn
|
||||
\twocolumn
|
||||
\sloppy
|
||||
\flushbottom
|
||||
\else
|
||||
\onecolumn
|
||||
\fi
|
||||
\endinput
|
||||
94
bierbook/grid.sty
Normal file
94
bierbook/grid.sty
Normal file
@ -0,0 +1,94 @@
|
||||
%%
|
||||
%% This is file `graphpap.sty',
|
||||
%% generated with the docstrip utility.
|
||||
%%
|
||||
%% The original source files were:
|
||||
%%
|
||||
%% graphpap.dtx (with options: `package')
|
||||
%%
|
||||
%% This is a generated file.
|
||||
%%
|
||||
%% Copyright 1993 1994 1995 1996 1997 1998 1999
|
||||
%% The LaTeX3 Project and any individual authors listed elsewhere
|
||||
%% in this file.
|
||||
%%
|
||||
%% This file was generated from file(s) of the LaTeX base system.
|
||||
%% --------------------------------------------------------------
|
||||
%%
|
||||
%% It may be distributed and/or modified under the
|
||||
%% conditions of the LaTeX Project Public License, either version 1.2
|
||||
%% of this license or (at your option) any later version.
|
||||
%% The latest version of this license is in
|
||||
%% http://www.latex-project.org/lppl.txt
|
||||
%% and version 1.2 or later is part of all distributions of LaTeX
|
||||
%% version 1999/12/01 or later.
|
||||
%%
|
||||
%% This file may only be distributed together with a copy of the LaTeX
|
||||
%% base system. You may however distribute the LaTeX base system without
|
||||
%% such generated files.
|
||||
%%
|
||||
%% The list of all files belonging to the LaTeX base distribution is
|
||||
%% given in the file `manifest.txt'. See also `legal.txt' for additional
|
||||
%% information.
|
||||
%%
|
||||
%%
|
||||
%% File `graphpap.dtx'.
|
||||
%% Copyright (C) 1994 by Leslie Lamport
|
||||
%% all rights reserved.
|
||||
%%
|
||||
\NeedsTeXFormat{LaTeX2e}
|
||||
\ProvidesPackage{grid}
|
||||
[1994/08/09 v1.0c Hacked LaTeX graphpap package (LL)]
|
||||
\let\c@@grid\count@
|
||||
\newcounter{gridstart}
|
||||
\def\@vgrid(#1,#2)#3#4#5{%
|
||||
\setcounter{@grid}{#1}%
|
||||
\addtocounter{@grid}{\c@gridstart}%
|
||||
\multiput(#1,#2)(#3,0){#4}{\line(0,1){#5}}%
|
||||
\multiput(#1,#2)(#3,0){#4}{\@vgridnumber{#3}}}
|
||||
\def\@vgridnumber#1{%
|
||||
\makebox(0,0)[t]{%
|
||||
\shortstack{\rule{0pt}{10pt}\\\arabic{@grid}}}%
|
||||
\addtocounter{@grid}{2*#1}}
|
||||
\def\@nonumvgrid(#1,#2)#3#4#5{%
|
||||
\multiput(#1,#2)(#3,0){#4}{\line(0,1){#5}}}
|
||||
\def\@hgrid(#1,#2)#3#4#5{%
|
||||
\setcounter{@grid}{#2}%
|
||||
\multiput(#1,#2)(0,#3){#4}{\line(1,0){#5}}%
|
||||
\multiput(#1,#2)(0,#3){#4}{\@hgridnumber{#3}}}
|
||||
%%\def\@hgridnumber#1{%
|
||||
%% \makebox(0,0)[r]{\arabic{@grid}\hspace{10pt}}%
|
||||
%% \addtocounter{@grid}{#1}}
|
||||
\def\@hgridnumber#1{}
|
||||
\def\@nonumhgrid(#1,#2)#3#4#5{%
|
||||
\multiput(#1,#2)(0,#3){#4}{\line(1,0){#5}}}
|
||||
\newcommand\graphpaper[1][10]{\leavevmode\@grid{#1}}
|
||||
\def\@grid#1(#2,#3)#4{\@grid@i{#1}{#2}{#3}(}
|
||||
\def\@grid@i#1#2#3(#4,#5){%
|
||||
\@tempcnta=#4\relax
|
||||
\divide\@tempcnta#1\relax
|
||||
\advance\@tempcnta1\relax
|
||||
{\thinlines\@nonumvgrid(#2,#3){#1}{\@tempcnta}{#5}
|
||||
\@tempcnta#4\relax
|
||||
\divide\@tempcnta5\relax
|
||||
\divide\@tempcnta#1\relax
|
||||
\advance\@tempcnta1\relax
|
||||
\@tempcntb5\relax
|
||||
\multiply\@tempcntb#1\relax
|
||||
\thicklines\@vgrid(#2,#3){\@tempcntb}{\@tempcnta}{#5}
|
||||
\@tempcnta#5\relax
|
||||
\divide\@tempcnta #1\relax
|
||||
\advance\@tempcnta1\relax
|
||||
\thinlines\@nonumhgrid(#2,#3){#1}{\@tempcnta}{#4}
|
||||
\@tempcnta#5\relax
|
||||
\divide\@tempcnta2\relax
|
||||
%% \divide\@tempcnta#1\relax
|
||||
\advance\@tempcnta1\relax
|
||||
%% \thicklines\@hgrid(#2,#3){\@tempcntb}{\@tempcnta}{#4}}%
|
||||
\setlength{\linethickness}{0.8mm}
|
||||
\@hgrid(#2,#3){2}{\@tempcnta}{#4}}%
|
||||
\ignorespaces}
|
||||
|
||||
\endinput
|
||||
%%
|
||||
%% End of file `graphpap.sty'.
|
||||
20
bierbook/gridold.sty
Normal file
20
bierbook/gridold.sty
Normal file
@ -0,0 +1,20 @@
|
||||
%**********************************************************************
|
||||
% grid.sty
|
||||
%**********************************************************************
|
||||
\newcounter{gridx} \newcounter{gridxx}
|
||||
\newcounter{gridy} \newcounter{gridyy}
|
||||
\newcounter{cms}
|
||||
\newcommand{\GRID}[2]{
|
||||
\setcounter{gridx}{#1} \setcounter{gridxx}{#1} \stepcounter{gridxx}
|
||||
\setcounter{gridy}{#2} \setcounter{gridyy}{#2} \stepcounter{gridyy}
|
||||
\thicklines
|
||||
\multiput(0,0)(1,0){\value{gridxx}}{\line(0,1){\value{gridy}}}
|
||||
\multiput(0,0)(0,1){\value{gridyy}}{\line(1,0){\value{gridx}}}
|
||||
\setcounter{cms}{0}
|
||||
\multiput(0.6,0.1)(1,0){\value{gridx}}{\stepcounter{cms}
|
||||
\makebox(0,0)[b]{\small \arabic{cms}}}
|
||||
\setcounter{cms}{-1}
|
||||
\multiput(-0.4,0.1)(0,1){\value{gridyy}}{\stepcounter{cms}
|
||||
\makebox(0,0)[b]{\small \arabic{cms}}}
|
||||
\thinlines}
|
||||
%**********************************************************************
|
||||
210
bierbook/seshbook.tex
Normal file
210
bierbook/seshbook.tex
Normal file
@ -0,0 +1,210 @@
|
||||
%%
|
||||
%% CUCC Expo Sesh Book
|
||||
%%
|
||||
|
||||
\documentclass[a5paper,10pt]{bb}
|
||||
|
||||
%\usepackage{pstricks}
|
||||
%\usepackage{tabularx}
|
||||
%\usepackage{color}
|
||||
%\usepackage{calc}
|
||||
\usepackage[left=15mm,right=15mm,top=8mm,bottom=20mm]{geometry}
|
||||
%\usepackage[left=15mm,right=5mm,top=-5mm,bottom=20mm]{geometry}
|
||||
%\usepackage{palatino}
|
||||
%\usepackage{grid}
|
||||
%\usepackage{graphpap}
|
||||
|
||||
%\setlength{\parskip}{1.5ex}
|
||||
\setlength{\parindent}{0pt}
|
||||
|
||||
\usepackage{color}
|
||||
\definecolor{hrulecol}{gray}{0.5}
|
||||
\definecolor{textcol}{gray}{0}
|
||||
|
||||
\newcommand{\sesh}{%
|
||||
{\bf Date:}
|
||||
\newline
|
||||
|
||||
{\bf Location (e.g. Hilda's / Loserhutte):}
|
||||
\newline
|
||||
|
||||
{\bf Total paid:}
|
||||
\newline
|
||||
|
||||
{\bf Paid by:}
|
||||
\newline
|
||||
|
||||
Please enter details of who consumed what and costs below.
|
||||
|
||||
\color{hrulecol}
|
||||
\vspace{7.8ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex}
|
||||
\newpage
|
||||
\
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\vspace{6ex} \hrule \vspace{6ex} \hrule \vspace{6ex} \hrule
|
||||
\color{textcol}
|
||||
}
|
||||
|
||||
|
||||
\begin{document}
|
||||
|
||||
\newfont{\gothic}{ygoth scaled \magstep5}
|
||||
\thispagestyle{empty}
|
||||
\begin{center}
|
||||
\ \vspace{3cm}\\
|
||||
{\Large Cambridge University Caving Club}\bigskip\\
|
||||
\vspace{5mm}
|
||||
{\Huge \bf Expo 2008}\\
|
||||
\vspace{2cm}
|
||||
%{\Huge \sc \gothic Sesh Book}\\
|
||||
%{\Huge \gothic Sesh Book}\\
|
||||
{\Huge Sesh Book}\\
|
||||
\vspace{4cm}
|
||||
\vfill
|
||||
\end{center}
|
||||
|
||||
\newpage
|
||||
|
||||
\ \newpage
|
||||
|
||||
%\tableofcontents
|
||||
|
||||
\newpage
|
||||
|
||||
\ \newpage
|
||||
|
||||
\chapter{Sesh 1}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 2}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 3}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 4}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 5}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 6}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 7}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 8}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 9}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 10}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 11}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 12}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 13}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 14}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 15}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 16}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 17}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 18}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 19}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 20}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 21}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 22}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 23}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 24}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 25}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 26}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 27}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 28}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 29}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 30}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 31}
|
||||
|
||||
\sesh
|
||||
|
||||
\chapter{Sesh 32}
|
||||
|
||||
\sesh
|
||||
|
||||
\end{document}
|
||||
@ -23,7 +23,7 @@ where the skyline crosses the right hand edge of the photo.</p>
|
||||
<!-- Photo L117, Photo-CD 6121 1651 2353 img 36 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description</li>
|
||||
<li><a href="../../plateau/index.html">Plateau</a> description
|
||||
<ul>
|
||||
|
||||
@ -19,7 +19,7 @@ work was done by walking a further ten-fifteen minutes to reach the plateau.</p>
|
||||
<!-- Neg. scanned Nikon Coolscan II 900x540 at 675 dpi, 1997.08.15, AERW -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description
|
||||
<ul>
|
||||
<li><a href="../../tcamps.htm#id1977camp">1977 Top Camp</a></li>
|
||||
|
||||
@ -22,7 +22,7 @@ of the Hinterer Schwarzmooskogel on the skyline to the right.</p>
|
||||
<!-- Photo CK152, Photo-CD 6121 1651 2353 img 40 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description</li>
|
||||
<li><a href="../../plateau/index.html">Plateau</a> description
|
||||
<ul>
|
||||
|
||||
@ -16,7 +16,7 @@ a bolt in sight!</p>
|
||||
<p class="caption">Photo © Andy Waddington, 1976</p>
|
||||
<hr style="clear: both" />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><span lang="de-at"><a lang="en" href="../index.html">Bräuning</a>
|
||||
Alm</span> description</li>
|
||||
<li>1623/96 <a href="../96/96.html">Cave Description</a></li>
|
||||
|
||||
@ -21,7 +21,7 @@ ten-fifteen minutes to reach the plateau.</p>
|
||||
<!-- Photo S125, Photo-CD 6121 1651 2353 img 80 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description
|
||||
<ul>
|
||||
<li><a href="../../tcamps.htm#id1977camp">1977 Top Camp</a></li>
|
||||
|
||||
@ -18,7 +18,7 @@ open shaft just behind the photographer. Note that all are in wetsuits!</p>
|
||||
<!-- Photo S107, Photo-CD 6121 1651 2353 img 98 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description
|
||||
<ul>
|
||||
<li><a href="../../tcamps.htm#id1977camp">1977 Top Camp</a></li>
|
||||
|
||||
@ -18,7 +18,7 @@ above the old campsite.</p>
|
||||
<!-- Photo S102, Photo-CD 6121 1651 2353 img 99 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.html">Bräuning</a> Alm description
|
||||
<ul>
|
||||
<li><a href="../../tcamps.htm#id1977camp">1977 Top Camp</a></li>
|
||||
|
||||
12
common/_menu.php
Normal file
12
common/_menu.php
Normal file
@ -0,0 +1,12 @@
|
||||
<div class="menu">
|
||||
<p id="topheader"><a href="index">Cambridge University<br />Caving Club Expedition</a><br /> main content:</p><br />
|
||||
<ul>
|
||||
<li><a href="intro">Introduction</li>
|
||||
<li><a href="infodx">Main index</a></li>
|
||||
<li><a href="indxal.htm">Cave index</a></li>
|
||||
<li><a href="handbook/index.htm">Expedition handbook</a></li>
|
||||
<li><a href="pubs.htm">Published reports</a></li>
|
||||
<li><a href="areas.htm">Area description</a></li>
|
||||
<li><a href="http://www.srcf.ucam.org/caving/wiki/Main_Page" target="_blank">CUCC website</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
207
css/main2.css
207
css/main2.css
@ -1,40 +1,205 @@
|
||||
.caption { font-size: 8pt; margin-bottom: 0pt; }
|
||||
/*This CSS file has been edited for CUCC - Expo website by A. Zabala on 2011*/
|
||||
/* code of colours TEST
|
||||
#C8E1E2 very light
|
||||
#99CCCC light blue
|
||||
#008787 darker blue for fonts
|
||||
#004C4C very dark
|
||||
*/
|
||||
body {
|
||||
background: #fff url(../images/style/bg-cambridge-caving-expedition.png) repeat-x 0 0;
|
||||
color: #000;
|
||||
font-family: 'Palatino Linotype','Book Antiqua',Palatino,serif;
|
||||
font-size: 12pt;
|
||||
margin-left: 275px;
|
||||
text-align: justify;
|
||||
max-width: 800px;
|
||||
}
|
||||
body#homepage {
|
||||
margin-left: auto;
|
||||
margin: auto;
|
||||
}
|
||||
.caption {
|
||||
color: #004C4C;
|
||||
font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif;
|
||||
font-size: 8pt;
|
||||
font-weight: bold;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.centre { text-align: center; }
|
||||
.plus2pt { font-size: 160%; }
|
||||
|
||||
body, td, center, ul, p, input { color: #000; font-family: sans-serif; }
|
||||
a {
|
||||
color: #008787;
|
||||
}
|
||||
a:hover {
|
||||
color: #d7442b;
|
||||
}
|
||||
a:link, a:visited { text-decoration: none; }
|
||||
div.centre img { vertical-align: middle; }
|
||||
div.centre img {
|
||||
border: 2px solid #99CCCC;
|
||||
margin: 25px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
hr {
|
||||
border: 1px solid #99CCCC;
|
||||
margin: 25px 0;
|
||||
}
|
||||
dt {
|
||||
clear: both;
|
||||
font-weight: bold;
|
||||
margin-top: 10px;
|
||||
}
|
||||
dd {
|
||||
display: inline;
|
||||
margin-left: 0pt;
|
||||
}
|
||||
/*HEADINGS*/
|
||||
h1, h2, h3, h4 {
|
||||
font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif;
|
||||
}
|
||||
h1 { text-align: center; font-size: 210%;
|
||||
line-height: 100%; }
|
||||
h2 { color: #009900; }
|
||||
h3 { color: #2c105e; }
|
||||
h4 { color: #0d664c; }
|
||||
line-height: 100%; margin: 35px 0 55px;}
|
||||
h2, h3, h4 {
|
||||
color: #008787;
|
||||
}
|
||||
h2#tophead {
|
||||
text-align: center;
|
||||
margin: 10px 0 -22px;
|
||||
}
|
||||
|
||||
/*IMAGES*/
|
||||
img.onright, div.onright { vertical-align: top; float: right;
|
||||
margin-left: 10pt; margin-bottom: 10pt;
|
||||
margin-right: 8pt; }
|
||||
img.onleft, div.onleft { vertical-align: top; float: left;
|
||||
margin-right: 10pt; margin-bottom: 10pt;
|
||||
margin-left: 8pt; }
|
||||
img.icon { vertical-align: middle; }
|
||||
img.icon { vertical-align: middle; margin: 10px 0; }
|
||||
img.aligntop { vertical-align: top; }
|
||||
table.imgtable { margin-left: auto; margin-right: auto; }
|
||||
table.imgtable td { vertical-align: middle; text-align: center;
|
||||
padding: 10px; }
|
||||
/*Menu*/
|
||||
.menu,
|
||||
ul#links {
|
||||
background: #fff url(../images/style/menu-main.png) no-repeat 0 0;
|
||||
clear: both;
|
||||
border: 2px solid #99CCCC;
|
||||
position: absolute;
|
||||
left: 35px;
|
||||
font-family: Tahoma,'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif;
|
||||
font-size: 75%;
|
||||
color: #888;
|
||||
width: 150px;
|
||||
padding: 32px 20px 15px;
|
||||
text-align: left;
|
||||
border-top-right-radius: 1em;
|
||||
}
|
||||
.menu {
|
||||
top: 20px;
|
||||
}
|
||||
ul#links {
|
||||
background-image: url(../images/style/menu-second.png);
|
||||
/*border-color: #C8E1E2;
|
||||
border-style: dotted;*/
|
||||
top: 20px /*300px; to be set once the menu is in all pages*/
|
||||
}
|
||||
p#topheader {
|
||||
font-weight: bold;
|
||||
margin: 10px 0 0;
|
||||
}
|
||||
.menu ul {
|
||||
margin: 0 0 0 15px;
|
||||
padding: 0;
|
||||
}
|
||||
.menu li,
|
||||
ul#links li {
|
||||
margin: 5px 0;
|
||||
list-style: square outside none;
|
||||
}
|
||||
ul#links li {
|
||||
margin: 5px 0 0 15px;
|
||||
}
|
||||
ul#links li ul {
|
||||
padding: 5px 0 5px 10px;
|
||||
}
|
||||
ul#links li li {
|
||||
margin: 0 0 0 5px;
|
||||
}
|
||||
.menu li a:hover,
|
||||
ul#links li a:hover {
|
||||
border-bottom: 2px solid #d7442b;
|
||||
}
|
||||
|
||||
/* "Traditional" table with borders.*/
|
||||
table.trad { margin: 0pt; border: 1px solid #000;
|
||||
border-color: #c0c0c0 #8d8d8d #8d8d8d #c0c0c0; }
|
||||
table.bigfatborder { border-width: 6px; }
|
||||
table.trad td, table.trad th { margin: 0pt; border: 1px solid #aaa;
|
||||
border-color: #8d8d8d #c0c0c0 #c0c0c0 #8d8d8d; }
|
||||
/* TABLES */
|
||||
table.trad, table.centre {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table.trad, table.trad th, table.trad td,
|
||||
table.centre, table.centre th, table.centre td {
|
||||
border: 1px solid #008787;
|
||||
margin: 0px;
|
||||
}
|
||||
table.trad th,
|
||||
table.centre th {
|
||||
background-color: #C8E1E2;
|
||||
}
|
||||
table.trad td,
|
||||
table.centre td {
|
||||
padding: 5px;
|
||||
border-color: #99CCCC;
|
||||
}
|
||||
table.centre {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
table.centre td {
|
||||
text-align: left;
|
||||
}
|
||||
table.bigfatborder {
|
||||
border-width: 6px;
|
||||
}
|
||||
|
||||
/* You are not expected to understand this. It is necessary. */
|
||||
table.centre { margin-left: auto; margin-right: auto; }
|
||||
table.centre td { text-align: left; }
|
||||
|
||||
h2#tophead { text-align: center; margin-bottom: -10pt; }
|
||||
table#cavepage { width: 100%; font-size: 160%; }
|
||||
/*SPECIAL PAGES*/
|
||||
/*caves*/
|
||||
table#cavepage {
|
||||
background: none repeat scroll 0 0 #FFFFFF;
|
||||
border: 2px solid #99CCCC;
|
||||
font-size: 160%;
|
||||
margin-top: 25px;
|
||||
padding: 25px;
|
||||
width: 100%;
|
||||
}
|
||||
table#cavepage th#kat_no { text-align: left; width: 25%; }
|
||||
table#cavepage th#name { text-align: center; width: 50%; }
|
||||
table#cavepage th#status { text-align: right; width: 25%; }
|
||||
/*Trip logbooks*/
|
||||
#logbk hr {
|
||||
display: none;
|
||||
}
|
||||
.tripdate, .trippeople {
|
||||
background-color: #C6E4E3;
|
||||
float: left;
|
||||
margin: 2px 1px 1px 1px;
|
||||
padding: 10px;
|
||||
border-bottom-right-radius: 1em;
|
||||
}
|
||||
.trippeople {
|
||||
background-color: #fff;
|
||||
float: right;
|
||||
font-style: italic;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.triptitle {
|
||||
border: 1px solid #99CCCC;
|
||||
border-top-width: 2px;
|
||||
color: #008787;
|
||||
font-size: 120%;
|
||||
font-weight: bold;
|
||||
padding-bottom: 15px;
|
||||
padding-top: 55px;
|
||||
text-align: center;
|
||||
}
|
||||
.timeug {
|
||||
text-align: right;
|
||||
font-weight: bold;
|
||||
margin-bottom: 10px;}
|
||||
|
||||
40
css/main2_old-pre20110428.css
Normal file
40
css/main2_old-pre20110428.css
Normal file
@ -0,0 +1,40 @@
|
||||
.caption { font-size: 8pt; margin-bottom: 0pt; }
|
||||
.centre { text-align: center; }
|
||||
.plus2pt { font-size: 160%; }
|
||||
|
||||
body, td, center, ul, p, input { color: #000; font-family: sans-serif; }
|
||||
a:link, a:visited { text-decoration: none; }
|
||||
div.centre img { vertical-align: middle; }
|
||||
h1 { text-align: center; font-size: 210%;
|
||||
line-height: 100%; }
|
||||
h2 { color: #009900; }
|
||||
h3 { color: #2c105e; }
|
||||
h4 { color: #0d664c; }
|
||||
img.onright, div.onright { vertical-align: top; float: right;
|
||||
margin-left: 10pt; margin-bottom: 10pt;
|
||||
margin-right: 8pt; }
|
||||
img.onleft, div.onleft { vertical-align: top; float: left;
|
||||
margin-right: 10pt; margin-bottom: 10pt;
|
||||
margin-left: 8pt; }
|
||||
img.icon { vertical-align: middle; }
|
||||
img.aligntop { vertical-align: top; }
|
||||
table.imgtable { margin-left: auto; margin-right: auto; }
|
||||
table.imgtable td { vertical-align: middle; text-align: center;
|
||||
padding: 10px; }
|
||||
|
||||
/* "Traditional" table with borders.*/
|
||||
table.trad { margin: 0pt; border: 1px solid #000;
|
||||
border-color: #c0c0c0 #8d8d8d #8d8d8d #c0c0c0; }
|
||||
table.bigfatborder { border-width: 6px; }
|
||||
table.trad td, table.trad th { margin: 0pt; border: 1px solid #aaa;
|
||||
border-color: #8d8d8d #c0c0c0 #c0c0c0 #8d8d8d; }
|
||||
|
||||
/* You are not expected to understand this. It is necessary. */
|
||||
table.centre { margin-left: auto; margin-right: auto; }
|
||||
table.centre td { text-align: left; }
|
||||
|
||||
h2#tophead { text-align: center; margin-bottom: -10pt; }
|
||||
table#cavepage { width: 100%; font-size: 160%; }
|
||||
table#cavepage th#kat_no { text-align: left; width: 25%; }
|
||||
table#cavepage th#name { text-align: center; width: 50%; }
|
||||
table#cavepage th#status { text-align: right; width: 25%; }
|
||||
@ -4,11 +4,6 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<title>CUCC Austria Expeditions: Festering</title>
|
||||
<link rel="stylesheet" type="text/css" href="css/main2.css" />
|
||||
<style type="text/css">
|
||||
<!--
|
||||
dt { clear: both }
|
||||
-->
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Expo Festering Guide</h1>
|
||||
|
||||
@ -155,7 +155,7 @@ Wookey's own <a href="http://www.chaos.org.uk/~wookey/">homepage</a></p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to <a href="../../index.htm">CUCC Home page</a></li>
|
||||
<li>Back to <a href="../index.htm">Expedition Intro page</a></li>
|
||||
<li><b>Main Indices:</b>
|
||||
|
||||
@ -16,7 +16,7 @@ years.</p>
|
||||
<!-- Photo scanned on Nikon Coolscan II 1997.08.12 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -23,7 +23,7 @@ which he had to be excavated during its exploration in 1996.</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -16,7 +16,7 @@ below the 161b and 161c entrances to Kaninchenhöhle.</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -18,7 +18,7 @@ characters in Swedish children's television.</p>
|
||||
<!-- Photo from Dunk's gif, 1998.08.22 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -20,7 +20,7 @@ Group</a> and caving frequently with UBSS.</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -18,7 +18,7 @@ helped in <a href="../../plateau/76/76.htm">Eislufthöhle</a> (1623/76),
|
||||
<hr style="clear: both" /><p class="caption">Photo © Andy Waddington, 1980</p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -74,7 +74,7 @@ home page</a></li></ul>
|
||||
<!-- Photo scanned at 2700 dpi 1997.12.17 and reduced /4 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -23,7 +23,7 @@ Photo taken in Hall of the Greene King in Eislufthöhle.</p>
|
||||
<!-- Photo S485, Photo-CD 6121 1651 2353 img 84 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -24,7 +24,7 @@ back to Loser, where Budge took part in the exploration of
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -25,7 +25,7 @@ In third party to the bottom on the exCS Gouffre Berger trip of 1991.</p>
|
||||
<!-- Photo ** not on this site ** -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -21,7 +21,7 @@ in Oman - one of exCS's farther flung members.</p>
|
||||
<!-- Photo scanned on Nikon Coolscan 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -20,7 +20,7 @@ in Kaninchenhöhle.</p>
|
||||
<!-- Photo scanned on Nikon Coolscan II 1997.08.14 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -19,7 +19,7 @@ camp in 1978.</p>
|
||||
<!-- Photo scanned from FP4 neg -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -35,7 +35,7 @@ Hongmeigui Cave Exploration Society</a>.</p>
|
||||
<!-- Photo from Dunk's gif 1998.08.22 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -19,7 +19,7 @@ Photo outside Bad Aussee Post Office.</p>
|
||||
<!-- Photo scanned Nikon Coolscan 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -20,7 +20,7 @@ Photo taken festering (at base camp?)</p>
|
||||
<!-- Photo scanned Nikon Coolscan II 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -17,7 +17,7 @@ Photo taken on the surveying and derigging trip in
|
||||
<!-- Photo-CD 6121 1651 2353 img 48 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -18,7 +18,7 @@ outside the entrance to Daren Cilau.</p>
|
||||
<!-- Photo scanned on Nikon Coolscan II -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -19,7 +19,7 @@ Photo taken on the surveying and derigging trip in
|
||||
<!-- Photo-CD 6121 1651 2353 img 48 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -22,7 +22,7 @@ its highest entrance in 1985.<br /> Photo outside Bad Aussee Post Office.
|
||||
<!-- Photo scanned Nikon Coolscan 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -16,7 +16,7 @@ Photo taken at Bull Pot Farm in the Dales</p>
|
||||
<!-- Photo scanned on Nikon Coolscan II 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -29,7 +29,7 @@ still the only expedition vehicle to have been older than its owner.</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -26,7 +26,7 @@ taken on the bottoming trip of Flapjack II at <a href="../../smkridge/161/l/bott
|
||||
<!-- Photo-CD 6121 1651 2353 img 65 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -24,7 +24,7 @@ exploration of Eislufthöhle (-506m) including the bottoming trip of
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -24,7 +24,7 @@ exploring <span lang="de-at">Gemsehöhle</span>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -18,7 +18,7 @@ Expedition 1988, 1989, 1991, 1995, 1996 - all in the
|
||||
<!-- Photo scanned on Nikon Coolscan II 1997.08.12 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -24,7 +24,7 @@ Coire Lagan, far from the road in Skye, with the lay preacher from Kintail
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -30,7 +30,7 @@ area...</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -15,7 +15,7 @@ Expedition 1982, 1983, but very little caving.</p>
|
||||
<!-- Photo scanned from mono negative -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -37,7 +37,7 @@ air out when diving).</p>
|
||||
<!-- Photo scanned on Nikon Coolscan 1998.11.12 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -26,7 +26,7 @@ Organisation</a> for several years.</p>
|
||||
<!-- Photo S118, Photo-CD 6121 1651 2353 img 64 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -19,7 +19,7 @@ Currently Meets Secretary for <a href="../../../excs/index.htm">exCS.</a></p>
|
||||
<!-- Photo cut out from Jonathan's website -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -23,7 +23,7 @@ first novice meet, October 1998.</p>
|
||||
<!-- Photo scanned 300 dpi from print, rotated and reduced /2 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -25,7 +25,7 @@ to nip back to the UK for an interview).</p>
|
||||
<!-- Photo-CD 6121 1651 2353 img 48 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -25,7 +25,7 @@ derig, 1979.</p>
|
||||
<!-- Photo-CD 6121 1651 2353 img 66 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -17,7 +17,7 @@ Photo taken at Top Camp, I think</p>
|
||||
<!-- Photo -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -33,7 +33,7 @@ photo on right near top camp.</p>
|
||||
<!-- Photo scanned on Nikon Coolscan II 1997.08.08 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -27,7 +27,7 @@ Splatdown - the bottom of
|
||||
<!-- Photo-CD 6121 1651 2353 img 65 -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to table of <a href="../index.htm">expo members</a></li>
|
||||
<li>Back to <a href="../../index.htm">Expedition Intro page</a>
|
||||
<ul>
|
||||
|
||||
@ -29,7 +29,7 @@ see the <a href="index.htm">members list</a>.</p>
|
||||
<p class="caption">Photos © various, 1977-96</p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>Table</b> of <a href="index.htm">expedition members</a> 1976-present</li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
<li><a href="../../index.htm">Back to CUCC Home page</a></li>
|
||||
|
||||
@ -312,7 +312,7 @@ high-quality photographs to start appearing soon.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>Back to <a href="../index.htm">CUCC Home page</a></li>
|
||||
<li>Back to <a href="index.htm">Expedition Intro page</a></li>
|
||||
<li><b>Main Indices:</b>
|
||||
|
||||
@ -16,7 +16,7 @@ tried to gather together logical groups of pictures for visual tours of
|
||||
CUCC's caving area.</p>
|
||||
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>The Pictures:</b>
|
||||
<ul>
|
||||
<li><b>Kaninchenhöhle</b>
|
||||
|
||||
@ -57,7 +57,7 @@ CUCC's caving area.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>More Pictures:</b>
|
||||
<ul>
|
||||
<li><b>Kaninchenhöhle</b>
|
||||
|
||||
@ -69,7 +69,7 @@ CUCC's caving area.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>More Pictures:</b>
|
||||
<ul>
|
||||
<li><b>Kaninchenhöhle</b>
|
||||
|
||||
@ -53,7 +53,7 @@ height="192" alt="" /></a></div>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>More Pictures:</b>
|
||||
<ul>
|
||||
<li><b>Kaninchenhöhle</b>
|
||||
|
||||
@ -48,7 +48,7 @@ CUCC's caving area.</p>
|
||||
<hr />
|
||||
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><b>More Pictures:</b>
|
||||
<ul>
|
||||
<li><b>Kaninchenhöhle</b>
|
||||
|
||||
@ -4,9 +4,6 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<title>CUCC Expo Rigging Handbook: Artificial belays - bolts</title>
|
||||
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
|
||||
<style type="text/css">
|
||||
ul.spacedout li { padding-top: 1em; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h2 id="tophead"> CUCC Expo Rigging Handbook</h2>
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
<META HTTP-EQUIV="keywords" CONTENT="Solar Panel, Battery">
|
||||
<META HTTP-EQUIV="description" CONTENT="Description of the solar panels and battery used at the stone bridge">
|
||||
<META HTTP-EQUIV="generator" CONTENT="a plain text editor, naturally...">
|
||||
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
|
||||
</HEAD>
|
||||
|
||||
<BODY BGCOLOR="#ffffff" TEXT="#000000" LINK="#4040ff" ALINK="#ff0000" VLINK="#400080">
|
||||
|
||||
<A name="top">
|
||||
<H1 ALIGN=CENTER>Solar Power</H1>
|
||||
<BODY id="top">
|
||||
<h2 id="tophead">CUCC Expedition Handbook</h2>
|
||||
<H1>Solar Power</H1>
|
||||
|
||||
<H2>Summary</H2>
|
||||
Since 2003 the bivy site at the stone bridge has had a number of solar panels and a car battery, which are mainly used for charging homemade battery packs, drill and AA/AAA batteries. This document is unfortunately written from memory, so someone with some electronics knowledge and a multimeter should set things up, so they can spot the errors and omissions in this document.
|
||||
@ -57,6 +57,25 @@ Store the battery full, this means that you should stop discharging the battery
|
||||
|
||||
<H2>Thanks</H2>
|
||||
On behalf on anyone using the system, thanks go to Earl Merson who provided most of the equipment, and more importantly carried a car battery up the hill. More thanks go to whoever carries it down again should it ever become knackered.
|
||||
<hr />
|
||||
|
||||
<ul id="links">
|
||||
<li><a href="index.htm">Expedition Handbook</a>
|
||||
<ul>
|
||||
<li><a href="survey/index.htm">Surveying guide</a> - Overview</li>
|
||||
<li><a href="look4.htm">Prospecting guide</a> – Overview</li>
|
||||
<li><a href="rescue.htm">Rescue guide</a></li>
|
||||
<li><a href="rigit.htm">Rigging guide</a></li>
|
||||
<li><a href="photo.htm">Photography guide</a></li>
|
||||
</ul></li>
|
||||
<li><a href="../infodx.htm">Index to info/topics pages</a></li>
|
||||
<li><a href="../indxal.htm">Full Index to area 1623</a>
|
||||
<ul>
|
||||
<li><a href="../areas.htm">Area/subarea descriptions</a></li>
|
||||
</ul></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
<li><a href="../../index.htm">Back to CUCC Home page</a></li>
|
||||
</ul>
|
||||
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
||||
@ -26,7 +26,7 @@ href="../photo.htm">Photography Guide</a> than the current effort. <b>This</b>
|
||||
guide covers essentially everything that goes in the <b>Survey Book</b> on each
|
||||
expedition.</p>
|
||||
|
||||
<p>For 1998, this screed was split up into digestible chunks. We hope you will
|
||||
<p>Since 1998, this screed has been split up into digestible chunks. We hope you will
|
||||
read all of it, but those who have been surveying before may want to skip the
|
||||
introductory material, whilst others may not need to read all of the more
|
||||
detailed topics.</p>
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
<META HTTP-EQUIV="keywords" CONTENT="Expo, accounts">
|
||||
<META HTTP-EQUIV="description" CONTENT="Description of the financial operation of the CUCC Expo.">
|
||||
<META HTTP-EQUIV="generator" CONTENT="a plain text editor, naturally...">
|
||||
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
|
||||
</HEAD>
|
||||
|
||||
<BODY BGCOLOR="#ffffff" TEXT="#000000" LINK="#4040ff" ALINK="#ff0000" VLINK="#400080">
|
||||
|
||||
<A name="top">
|
||||
<H1 ALIGN=CENTER>Expo Accounting Documentation</H1>
|
||||
<body>
|
||||
<h2 id="tophead">CUCC Expedition Handbook</h2>
|
||||
<h1 id="top">Expo Accounting Documentation</h1>
|
||||
|
||||
<H2>Contents</H2>
|
||||
|
||||
@ -286,13 +286,13 @@
|
||||
|
||||
<P>The British Cave Research Association organises special travel insurance with provision for caving. Details are given on the BCRA website. The administrator is:</P>
|
||||
|
||||
<P>John Cooper, <BR>
|
||||
31 Elm Close, <BR>
|
||||
Wells, <BR>
|
||||
Somerset, <BR>
|
||||
<P>John Cooper, <BR />
|
||||
31 Elm Close, <BR />
|
||||
Wells, <BR />
|
||||
Somerset, <BR />
|
||||
BA5 1LZ</P>
|
||||
|
||||
<P>Telephone: 01749 670568 <BR>
|
||||
<P>Telephone: 01749 670568 <BR />
|
||||
Email: jc@johnmcooper.freeserve.co.uk</P>
|
||||
|
||||
<P>The insurance does not seem to cover canyoning holidays, but possibly would cover a day's canyoning during a primarily caving holiday. The cost of the insurance has increased recently; there may be a better deal elsewhere. Personal members of the BCRA get a reasonable discount; you will need to quote their BCRA membership number (ask for it on the Expo form). </P>
|
||||
@ -449,6 +449,26 @@ Email: jc@johnmcooper.freeserve.co.uk</P>
|
||||
<HR>
|
||||
<SMALL>Started 1999-12-31 by Earl Merson, Treasurer 1998 & 1999.<br>
|
||||
This page was last modified 2000-01-07</SMALL></P>
|
||||
<hr />
|
||||
|
||||
<ul id="links">
|
||||
<li><a href="index.htm">Expedition Handbook</a>
|
||||
<ul>
|
||||
<li><a href="survey/index.htm">Surveying guide</a> – Overview</li>
|
||||
<li><a href="look4.htm">Prospecting guide</a> – Overview</li>
|
||||
<li><a href="rescue.htm">Rescue guide</a></li>
|
||||
<li><a href="rigit.htm">Rigging guide</a></li>
|
||||
<li><a href="photo.htm">Photography guide</a></li>
|
||||
</ul></li>
|
||||
<li><a href="../infodx.htm">Index to info/topics pages</a></li>
|
||||
|
||||
<li><a href="../indxal.htm">Full Index to area 1623</a>
|
||||
<ul>
|
||||
<li><a href="../areas.htm">Area/subarea descriptions</a></li>
|
||||
</ul></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
<li><a href="../../index.htm">Back to CUCC Home page</a></li>
|
||||
</ul>
|
||||
|
||||
</BODY>
|
||||
|
||||
|
||||
@ -8,346 +8,49 @@
|
||||
<body>
|
||||
<h2 id="tophead">CUCC Expedition Handbook</h2>
|
||||
<h1>Updating the website - HOWTO</h1>
|
||||
|
||||
<h2>Rationale for having a system at all: </h2>
|
||||
|
||||
<p>For years, the website has been built by hand-editing HTML pages,
|
||||
"traditionally" by one or two people, in constant email contact. Obviously
|
||||
those people were thoroughly familiar with the locations of all the pages,
|
||||
the conventions used for naming files, the style used throughout the site and
|
||||
a few conventions for adding things which made the site easier to maintain.
|
||||
There are also a few odd tools written to hack from one format (such as a
|
||||
scanned journal page) to another which those users were happy with (but which
|
||||
may not be useful for anyone else - typically written in BBC Basic on an
|
||||
Acorn machine :-). The survey dataset was maintained in much the same way,
|
||||
though a lot more of that work was done actually on expedition, and therefore
|
||||
by a lot more people.</p>
|
||||
|
||||
<p>This work becomes quite onerous when neither of the two usual maintainers
|
||||
went on expo this year, and in any case, it is usually far better for the
|
||||
people who actually explored the cave to integrate their stuff into the
|
||||
existing cave descriptions. To make this easier (indeed, possible !), both
|
||||
the web pages and the survey data are now held in a CVS repository, which
|
||||
means lots of people can edit different parts (even different parts of the
|
||||
same file) at the same time without causing chaos, and a record is kept of
|
||||
who changed what, and why.</p>
|
||||
|
||||
<p>This how-to guide is split into two parts - one for those who have never used
|
||||
CVS before, and one for everyone, outlining the structure of the site and the
|
||||
few conventions used within it. It is still possible for you to contribute to
|
||||
the updating of the site without learning CVS, by sending changes or fault
|
||||
reports (as plain text) to one of the regular maintainers - it is not one of
|
||||
the aims of this system to exclude non-computer-nerds, just to reduce the
|
||||
computer-nerds' workload :-)</p>
|
||||
|
||||
<h2>The CVS bit</h2>
|
||||
|
||||
<!-- Written 2001-10-08 to 2001-10-12, Andy Waddington -->
|
||||
|
||||
<p>This bit should not change significantly with structural change to the
|
||||
website (such as serving it all via PHP from a database). I hope it is all
|
||||
clear - it was written in parallel with my own learning how to use CVS. It
|
||||
may be verbose, but I hope that writing it this way means that it is low on
|
||||
omissions.</p>
|
||||
|
||||
<h3>CVS Rationale:</h3>
|
||||
|
||||
<p>The problem with having more than one or two people do the work is that it
|
||||
generates increasing amounts of email to ensure that people don't update old
|
||||
versions of pages, and throw away someone else's recent work. The solution to
|
||||
all this is to put the entire site into a system called "Concurrent Versions
|
||||
System" under which lots of people can make changes, all of which are safely
|
||||
merged together without losing any changes. Just occasionally, the system
|
||||
will detect that two people have changed the same bit of text in conflicting
|
||||
ways, and it is then up to them to sort it out, but this is a great
|
||||
improvement over what has gone before.</p>
|
||||
|
||||
<h3>How does it work ?</h3>
|
||||
|
||||
<p>There is a central CVS repository, from which someone needing to do updates
|
||||
can "check out" a copy of the page they want to change. They then make the
|
||||
changes or additions required, and "commit" the new page back into the
|
||||
system. The system keeps a record of all such changes, with a log message
|
||||
in which you should say why the change was made (the system knows who you
|
||||
are and when you committed the change, so you don't need to tell it that).</p>
|
||||
|
||||
<p>In order to join in the work, the central CVS repository needs to know
|
||||
about you, so it can allow you to commit changes into the system (and thus
|
||||
to stop random hackers replacing cave surveys with redirects to a porn
|
||||
site, or whatever).</p>
|
||||
|
||||
<h2>Becoming a website updater</h2>
|
||||
|
||||
<h3>Software requirements</h3>
|
||||
|
||||
<p>You need a system which has a CVS client and supports SSH, so that you can
|
||||
log in without sending a password in clear text over the Internet. You need
|
||||
an editor with which you are happy to edit web pages. Ideally this will
|
||||
NOT be one of the commercial WYSIWYG web editors which add whole loads of
|
||||
guff to your webpage in a manner that you don't see (and which, incidentally,
|
||||
makes the pages vastly harder to maintain for the next person who comes
|
||||
along with a basic HTML editor, not to mention making the pages load more
|
||||
slowly and typically work in fewer browsers). Most of us use basic
|
||||
text editors with extensions that make editing HTML easier. The easiest
|
||||
way to get all this is to have a Linux machine, since most distributions
|
||||
have all the tools you need ready built in. The rest of this page assumes
|
||||
that you are doing all this on a recent Linux system. There are a few
|
||||
useful links for those using Mac, RISC OS or Windows machines along
|
||||
with the links to more detailed documentation <a href="#morelinks">at the end of
|
||||
this page.</a> The CVS machine itself is a Linux box, and some of the
|
||||
commands you need to use involve typing at the command line on that machine,
|
||||
so some familiarity with Unix/Linux will make you feel more at home.</p>
|
||||
|
||||
<p>The CVS repository is on a machine called cvs.cucc.survex.com, so you need to get
|
||||
(from Mark Shinwell, at present) a username and password. If you are told
|
||||
these via email, the first thing you will need to do is change the password,
|
||||
using ssh:</p>
|
||||
|
||||
<pre>ssh <i>username</i>@cvs.cucc.survex.com passwd</pre>
|
||||
|
||||
<p>(where <tt><i>username</i></tt> is the username given to you; for CU
|
||||
students this will usually be your CRSID). This command is in three parts:
|
||||
"ssh" says to open an encrypted connection
|
||||
"<i>username</i>@cvs.cucc.survex.com" says which user on what machine to
|
||||
connect to, "passwd" is the command you are going to execute on that machine,
|
||||
as that user, in this case a command to change your password.</p>
|
||||
|
||||
<p>this will ask for the existing password to open the connection to the cvs
|
||||
machine (this allows the "ssh <i>username</i>@cvs.cucc.survex.com" to happen), then
|
||||
ask for it again (to validate the passwd command). Then you need to type
|
||||
your new password twice (second time to confirm that you really typed what
|
||||
you thought the first time), and should then tell you that the password was
|
||||
updated OK. You will need a password made up of mixed uppercase and
|
||||
lowercase letters, digits and punctuation, and not apparently based on any
|
||||
dictionary word. This will make it a real pain to remember and type, but we
|
||||
get round that in the next step:</p>
|
||||
|
||||
<p>Generate a public/private keypair to do authentication automatically.
|
||||
With recent versions of openssh, you need to type</p>
|
||||
|
||||
<pre>ssh-keygen -t dsa</pre>
|
||||
|
||||
<p>while with older versions, you may find that "-t" is not a valid option, in
|
||||
which case</p>
|
||||
|
||||
<pre>ssh-keygen -d</pre>
|
||||
|
||||
<p>does the same thing. Either way, it will suggest a place to store the
|
||||
keypair (~/.ssh/id-dsa) which you should accept. This needs to be kept
|
||||
secure (so don't generate the keypair and keep it on a publically
|
||||
accessible machine, for example).</p>
|
||||
|
||||
<p>We want to force ssh to use protocol 2, but in a typical distribution,
|
||||
it tries protocol 1 first - this will oblige you to type your password
|
||||
every time, which is a pain. You can change this globally, for everyone,
|
||||
by altering /etc/ssh/ssh_config but it is probably best to alter it for
|
||||
just the user you will be when doing the CVS commands. Create a file
|
||||
~/.ssh/config containing the lines</p>
|
||||
|
||||
<pre># Make sure we use protocol 2 to avoid tedious password typing:
|
||||
Host cvs.cucc.survex.com
|
||||
Protocol 2</pre>
|
||||
|
||||
<p>Now copy the public key to the server. One thing that might trip you up is
|
||||
that the directory ~/.ssh may not exist on the remote machine. To create it
|
||||
and copy the key:</p>
|
||||
|
||||
<pre>ssh <i>username</i>@cvs.cucc.survex.com mkdir ~/.ssh
|
||||
scp ~/.ssh/id_dsa.pub <i>username</i>@cvs.cucc.survex.com:.ssh/authorized_keys2</pre>
|
||||
|
||||
<p>(note the nasty American spelling here - easy to mistype if you're English)-:
|
||||
Those commands will ask for your password again, but that should be the last
|
||||
time you'll need to enter it on that machine. Having done all that, you
|
||||
should now be able to do</p>
|
||||
|
||||
<pre>ssh cvs.cucc.survex.com</pre>
|
||||
|
||||
<p>without being asked for a password. That would get you a command line to do
|
||||
things on the cvs machine, but for most jobs, you only need to do CVS
|
||||
commands on your own machine, so get out of that command line with</p>
|
||||
|
||||
<pre>exit</pre>
|
||||
|
||||
<p>To use the CVS commands on your local machine (for checking out pages
|
||||
to edit and committing them back) you need to tell cvs where the archive
|
||||
is. You can include a "-d <i>username</i>@cvs.cucc.survex.com:/export/cvs" with
|
||||
cvs commands (useful if you use cvs on more than one repository), but
|
||||
it is usually easier to add</p>
|
||||
|
||||
<pre>export CVSROOT=<i>username</i>@cvs.cucc.survex.com:/export/cvs</pre>
|
||||
|
||||
<p>to some script that will be executed before you want to use cvs. Easiest
|
||||
would usually be ~/.bashrc (assuming your default shell is bash). Also
|
||||
add</p>
|
||||
|
||||
<pre>export CVS_RSH=ssh</pre>
|
||||
|
||||
<p>You are now ready to get a copy of the page(s) you want to edit. If you
|
||||
don't have a copy of the site on CD, it may be easiest to download the
|
||||
whole site - having the other pages for context makes life much easier
|
||||
if you are maintaining links between pages. Move into a local directory
|
||||
where you will edit the pages, I use a tree in my own home directory,
|
||||
which, for historical reasons, is called chaos, but you can choose any
|
||||
directory where you will have the write-access needed to edit pages:</p>
|
||||
|
||||
<pre>cd ~/chaos
|
||||
cvs checkout expoweb</pre>
|
||||
|
||||
<p>and then move into the directory tree to make your changes. Thus far,
|
||||
everything has been at the command line, but often doing the editing
|
||||
will be more convenient through a desktop interface. You might find that
|
||||
you want to set your file browser *not* to display an HTML view of the
|
||||
files, otherwise you will end up browsing the pages, rather than the
|
||||
file tree, which makes editing much harder :-(</p>
|
||||
|
||||
<p>When you have made your changes, you need to check that no-one else
|
||||
has changed things in a way which clashes. Its also a good idea to
|
||||
keep your own copies of the pages as up-to-date as possible, so at
|
||||
the top level of your copy ( ~/chaos in my case ):</p>
|
||||
|
||||
<pre>cvs update</pre>
|
||||
|
||||
<p>If you are unlucky (most likely if you made changes a long time after you
|
||||
last ran update) this will tell you about conflicts which you'll need to
|
||||
resolve with the other person(s) who made changes. Make sure you do
|
||||
resolve these changes, since just committing your version throws away
|
||||
the other person's changes from the current version (CVS keeps a record
|
||||
of all the changes, so they can be recovered, but it is easier and much
|
||||
more polite to resolve the problem through dialogue). Once all is OK</p>
|
||||
|
||||
<pre>cvs commit</pre>
|
||||
|
||||
<p>If you are updating the whole tree like this, it is a good idea to make
|
||||
sure you get any new directories and remove any old ones (which doesn't
|
||||
happen by default). To do this specify</p>
|
||||
|
||||
<pre>cvs update -Pd</pre>
|
||||
|
||||
<p>You can just update one subdirectory (and everything under it) or an
|
||||
individual file by adding its name to the end of the command, such as</p>
|
||||
|
||||
<pre>cvs update expo/smkridge/161
|
||||
cvs commit expo/smkridge/161/france.htm</pre>
|
||||
|
||||
<p>if you create a new page, lets say for a description of a new cave on
|
||||
the plateau, 1623/505, it would probably be called 505.htm in the
|
||||
plateau subdir. "cvs commit" will not work on files that cvs does not
|
||||
know about, so to let cvs know it is there use</p>
|
||||
|
||||
<pre>cvs add expo/plateau/505.htm
|
||||
cvs commit expo/plateau/505.htm</pre>
|
||||
|
||||
<p>cvs works by maintaining DIFFerences between files as they are updated.
|
||||
This works on text files, and cvs can convert the line-ending conventions
|
||||
on different platforms. If you add a binary file, that sort of translation
|
||||
can be extremely bad news, so use "-kb" to tell cvs when adding a binary
|
||||
file:</p>
|
||||
|
||||
<pre>cvs add -kb expo/plateau/others/505.png</pre>
|
||||
|
||||
<!-- there is a way to tell the repository to know about some standard
|
||||
filename extensions, like .png, .gif, .jpg, and always treat them as
|
||||
binaries - we should do this !! -->
|
||||
|
||||
<p>Sometimes, you may find that an unwieldy chunk of cave description needs
|
||||
to be split into two or more pages (this happened quite often with 161).
|
||||
It is usually clearer to everyone if none of the new files have the same
|
||||
name as the old one. So in addition to using "cvs add" to add the new
|
||||
pages, you need</p>
|
||||
|
||||
<pre>rm expo/smkridge/161/nowsplit.htm
|
||||
cvs remove expo/smkridge/161/nowsplit.htm
|
||||
cvs commit expo/smkridge/161/nowsplit.htm</pre>
|
||||
|
||||
<p>Whenever you do a "cvs commit" you will be asked for a log message, which is
|
||||
just some text to help others know what sort of update you were doing. So
|
||||
something like "correcting typos" or "added new passages off Puerile Humour",
|
||||
"fixing broken links" are the minimum sort of level you need to add. (Martin,
|
||||
are you reading this?) It is a good idea to commit files back to the repository
|
||||
one or two at a time, so the comments can be relevant to each particular file.
|
||||
It is often worth while committing unrelated changes separately, even if they
|
||||
affect the same file. For instance, if you correct some typos in one page, and
|
||||
link a new photo to several pages, including that same one, it is better to
|
||||
commit each set of changes separately. This does take some discipline, however,
|
||||
as it is usually just whilst you are making one set of changes that you notice
|
||||
the typo, and if you don't change it then and there, it gets forgotten. Your
|
||||
call.</p>
|
||||
|
||||
<p>Of course, if you did some major overhaul to a lot of files (like changing
|
||||
lots of links after some sort of reorganisation) you'd want to commit them
|
||||
all together with a suitable log message. It really is a good idea to
|
||||
avoid doing this whilst other people might be editing some of the files,
|
||||
as you could spend ages resolving conflicts...</p>
|
||||
|
||||
<h3>Avoiding cocks-up</h3>
|
||||
|
||||
<p>Running cvs update just before you start editing saves you making changes to
|
||||
out-of-date stuff, and committing changes soon after editing saves everyone
|
||||
else from working on out-of-date pages. Both of which will save you work
|
||||
resolving conflicts later on - but only if *everyone* remembers to do this.</p>
|
||||
|
||||
<p>If you had to leave some editing part way through, and came back to it later,
|
||||
its easy to forget what you have finished and what you haven't. Running</p>
|
||||
|
||||
<pre>cvs diff -u</pre>
|
||||
|
||||
<p>will tell you what you changed *from the copy you checked out* (so you
|
||||
don't get confused by a list of things which other people have changed in
|
||||
the meantime). This helps to avoid leaving things like notes to yourself
|
||||
lying around in the file, and should help to avoid failing to update
|
||||
links, though that is harder, since you have to notice that a change you
|
||||
meant to make hasn't appeared in the list of changes.</p>
|
||||
|
||||
<pre>cvs -n update </pre>
|
||||
|
||||
<p>doesn't actually update anything, but tells you what would have happened.
|
||||
This is useful at various times, such as for spotting conflicts early on
|
||||
whilst you are part way through doing a big update. Changing it to</p>
|
||||
|
||||
<pre>cvs -nq update</pre>
|
||||
|
||||
<p>suppresses some of the less useful output. Files which are marked with
|
||||
a "?" are ones which cvs doesn't know about - maybe you haven't "cvs add"ed
|
||||
them yet.</p>
|
||||
|
||||
<h3>Updating the website</h3>
|
||||
<p>Having committed any changes to the cvs tree, connect to cvs.cucc.survex.com
|
||||
via ssh and run the command <tt>/home/cucc/bin/expoweb-update</tt>. (You can do this
|
||||
all in one step by just typing <tt>ssh cvs.cucc.survex.com
|
||||
/home/cucc/bin/expoweb-update</tt>.)</p>
|
||||
|
||||
<h3>CVS documentation</h3>
|
||||
|
||||
<p>Obviously, CVS has lots of bells and whistles that you don't need just to
|
||||
edit a few web pages. Here are a few links which you might care to look at.
|
||||
Many more are accessible via <a href="http://www.cvshome.org/">CVS' home
|
||||
page</a>.</p>
|
||||
|
||||
<p>OK, that's how to use CVS. You might now like to read a bit about editing
|
||||
the web pages you checked out - there are a few conventions to help to
|
||||
maintain a consistent style (although we might change that style soon, as
|
||||
soon as we can agree about a new look). Just as in programming, there are
|
||||
also a lot of useful things you can do by adding comments (which the end
|
||||
reader of the pages won't see).</p>
|
||||
|
||||
<h3><a id="morelinks">Further reading</a></h3>
|
||||
|
||||
<ul>
|
||||
<li><a href="http://www.cvshome.org/new_users.html">CVS for new users</a></li>
|
||||
<li><a href="http://www.cvshome.org/docs/manual">Version Management with
|
||||
CVS</a> (the official manual)</li>
|
||||
<li><a href="http://cvsbook.red-bean.com/">Open Source development with
|
||||
CVS</a> (chapters from a book, aimed at programmers, but almost all
|
||||
applicable to open source document authors too)</li>
|
||||
<li><a href="http://www.cvshome.org/dev/addons.html">CVS Add-ons</a> page
|
||||
includes graphical CVS clients for Mac, Windows and, of course, Linux.</li>
|
||||
<li>And a <a href="http://gallery.uunet.be/John.Tytgat/cvs/">CVS client
|
||||
for RISC OS</a> (but note that this didn't appear to support ssh when this
|
||||
page was written (2001-10-12)).</li>
|
||||
<li><a href="http://www.durak.org/cvswebsites/">CVS for websites</a>:
|
||||
most manuals assume you are using CVS to develop software - this site is
|
||||
specific to using CVS to maintain web pages.</li>
|
||||
</ul>
|
||||
Please refer to <a href="http://www.srcf.ucam.org/caving/wiki/Expo_website_manual" target="_blank">the latest web updating guide in CUCC website</a>
|
||||
<hr />
|
||||
Expo data is kept in a number of different locations.
|
||||
|
||||
<dl>
|
||||
<dt>Loser</dt>
|
||||
<dd>Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser</dd>
|
||||
<dt>Expoweb</dt>
|
||||
<dd>Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb</dd>
|
||||
<dt>Tunnel data</dt>
|
||||
<dd>Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata</dd>
|
||||
<dt>Troggle</dt>
|
||||
<dd>Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle</dd>
|
||||
<dt>Scanned notes</dt>
|
||||
<dd>Scans of survey notes and drawn up surveys. Can be got via rsync.</dd>
|
||||
</dl>
|
||||
|
||||
<p>Mercurial is a distributed revision control system. On expo this means that
|
||||
many people can edit and merge their changes with each other either when they can access
|
||||
the internet. Mercurial is over the top for scanned survey notes, which do not get modified, so
|
||||
they are kept as a plain directory of files.
|
||||
|
||||
<p>If you run windows, you are recommended to install
|
||||
<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>, which nicely interfaces with
|
||||
windows explorer.
|
||||
|
||||
<h2>Get the repositories</h2>
|
||||
<h3>Mercurial</h3>
|
||||
<h4>Linux</h4>
|
||||
hg clone RepositoryURL
|
||||
<h4>Windows</h4>
|
||||
Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>.
|
||||
|
||||
In windows explorer right click, select Tortoise Hg .. and click Clone repository.
|
||||
<br>Set the source path to RepositoryURL
|
||||
<br>Set the destination to somewhere on your local harddisk.
|
||||
<br>Press clone.
|
||||
|
||||
<h3>RSync</h3>
|
||||
<h4>Linux</h4>
|
||||
rsync -av expoimages expo@seagrass.goatchurch.org.uk:
|
||||
<h4>Windows</h4>
|
||||
Not sure yet
|
||||
|
||||
<h2>The website conventions bit</h2>
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ I'll be adding some terms from this as time goes by...</p>
|
||||
<tr><td>Abseil</td>
|
||||
<td>Abseilung</td>
|
||||
<td>Rappel</td>
|
||||
<td>Rappel</td></tr>
|
||||
<td>Rapel</td></tr>
|
||||
|
||||
<tr><td>Aid</td>
|
||||
<td>Hilfsmittel</td>
|
||||
@ -52,7 +52,7 @@ I'll be adding some terms from this as time goes by...</p>
|
||||
<tr><td>Aiguille<br />needle</td>
|
||||
<td>Nadel, Spitze</td>
|
||||
<td>Aiguille</td>
|
||||
<td>Torre Rocosa,<br />Campanario</td></tr>
|
||||
<td>Aguja, Torre Rocosa,<br />Campanario</td></tr>
|
||||
|
||||
<tr><td>Alluvium</td>
|
||||
<td>Alluvium</td>
|
||||
@ -78,18 +78,18 @@ I'll be adding some terms from this as time goes by...</p>
|
||||
<td>Beisteigung,<br />Begehung<br /><br />Erstbesteigung<br />
|
||||
Erst Berichtete Besteigung</td>
|
||||
<td>Ascension<br /><br />.. alpine<br />première ..<br />.. enregistrée</td>
|
||||
<td>Ascensión,<br />Subida,Escalada<br />.. alpina<br />prímera ..<br />
|
||||
<td>Ascensión,<br />Subida,Escalada<br />.. alpina<br />primera ..<br />
|
||||
.. registrada</td></tr>
|
||||
|
||||
<tr><td>Avalanche</td>
|
||||
<td>Lawine</td>
|
||||
<td>Avalanche</td>
|
||||
<td>Alud, Avalancha(Arg.)</td></tr>
|
||||
<td>Alud, Avalancha</td></tr>
|
||||
|
||||
<tr><td>Belay<br />(verb)</td>
|
||||
<td>Sicherung<br />Sichern</td>
|
||||
<td>Relais<br />Assurer</td>
|
||||
<td>Asegurado ?<br />Asegurar</td></tr>
|
||||
<td>Asegurar</td></tr>
|
||||
|
||||
<tr><td>Bergschrund</td>
|
||||
<td>Bergschrund, Randkluft</td>
|
||||
@ -109,7 +109,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Buttress</td>
|
||||
<td>Rippe, Pfeiler,<br />Stutze</td>
|
||||
<td>Pilier</td>
|
||||
<td>Contrafuerte(Méx.)<br />Escalón (Arg.)</td></tr>
|
||||
<td>Contrafuerte(Méx.)<br />Escalón, Repisa</td></tr>
|
||||
|
||||
<tr><td>Bypass (verb)</td>
|
||||
<td>Umgehen</td>
|
||||
@ -134,7 +134,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Canyon</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Cañon</td></tr>
|
||||
<td>Cañón</td></tr>
|
||||
|
||||
<tr><td>Cave</td>
|
||||
<td>Höhle</td>
|
||||
@ -144,7 +144,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Chimney</td>
|
||||
<td>Kamin</td>
|
||||
<td>Cheminée</td>
|
||||
<td></td></tr>
|
||||
<td>Chimenea</td></tr>
|
||||
|
||||
<tr><td>Chockstone</td>
|
||||
<td>Klemmblock</td>
|
||||
@ -174,7 +174,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Cloud</td>
|
||||
<td>Wolke</td>
|
||||
<td>Nuage</td>
|
||||
<td></td></tr>
|
||||
<td>Nube</td></tr>
|
||||
|
||||
<tr><td>Col</td>
|
||||
<td>Joch, Sattel, Scharte</td>
|
||||
@ -184,7 +184,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Corner</td>
|
||||
<td>Eck</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Esquina</td></tr>
|
||||
|
||||
<tr><td>Cornice</td>
|
||||
<td>Wächte</td>
|
||||
@ -199,7 +199,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Crack<br />finger-crack<br />jam-crack<br />off-width</td>
|
||||
<td><br /><br /><br /></td>
|
||||
<td><br /><br /><br /></td>
|
||||
<td><br /><br /><br /></td></tr>
|
||||
<td>Grieta, fisura<br /><br /><br /></td></tr>
|
||||
|
||||
<tr><td>Crest</td>
|
||||
<td>Kamm</td>
|
||||
@ -209,12 +209,12 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Crevasse</td>
|
||||
<td>Gletscherspalte</td>
|
||||
<td>Crevasse</td>
|
||||
<td>Grieta</td></tr>
|
||||
<td>Grieta, fisura</td></tr>
|
||||
|
||||
<tr><td>Cross<br />(verb)</td>
|
||||
<td>Kreuz<br />Kreuzen</td>
|
||||
<td>Croix<br />Traverser</td>
|
||||
<td>Cruz<br />Atravesar</td></tr>
|
||||
<td>Cruzar<br />Atravesar</td></tr>
|
||||
|
||||
<tr><td>Descend</td>
|
||||
<td>Absteigen</td>
|
||||
@ -239,7 +239,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Direct</td>
|
||||
<td>gerade</td>
|
||||
<td>direct</td>
|
||||
<td></td></tr>
|
||||
<td>Directo</td></tr>
|
||||
|
||||
<tr><td>Divide, Watershed</td>
|
||||
<td>Scheide</td>
|
||||
@ -259,17 +259,17 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Exposure</td>
|
||||
<td></td>
|
||||
<td>Exposition</td>
|
||||
<td></td></tr>
|
||||
<td>Exposición</td></tr>
|
||||
|
||||
<tr><td>Face</td>
|
||||
<td>Flanke, Wand</td>
|
||||
<td>Face</td>
|
||||
<td>Pared, Paredo</td></tr>
|
||||
<td>Pared, Cara</td></tr>
|
||||
|
||||
<tr><td>Fall, Peel, Lob</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Caer, Desconchar (wall) - Raspar (skin), Lanzar </td></tr>
|
||||
|
||||
<tr><td>Firm (sound)</td>
|
||||
<td>Fest</td>
|
||||
@ -324,17 +324,17 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Hail</td>
|
||||
<td>Hagel</td>
|
||||
<td>Grâle</td>
|
||||
<td>Pedrisco</td></tr>
|
||||
<td>Granizo, Pedrisco</td></tr>
|
||||
|
||||
<tr><td>Handhold</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Griff</td></tr>
|
||||
<td>Agarre</td></tr>
|
||||
|
||||
<tr><td>Hole</td>
|
||||
<td>Loch</td>
|
||||
<td>Trou</td>
|
||||
<td></td></tr>
|
||||
<td>Agujero</td></tr>
|
||||
|
||||
<tr><td>Horn</td>
|
||||
<td>Horn</td>
|
||||
@ -359,12 +359,12 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Ice plateau</td>
|
||||
<td>Eis Plateau</td>
|
||||
<td>Plateau Glacière</td>
|
||||
<td>Pampa (mesa) de Hielo</td></tr>
|
||||
<td>Pampa (meseta) de Hielo</td></tr>
|
||||
|
||||
<tr><td>Junction<br />(route turns off)</td>
|
||||
<td>Abzweigung</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Cruce, Giro</td></tr>
|
||||
|
||||
<tr><td>Knife edge rib</td>
|
||||
<td></td>
|
||||
@ -374,7 +374,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Landslide<br />Mudflow/slide</td>
|
||||
<td>Erdrutsch</td>
|
||||
<td>Glissement de terrain<br />Coulée de Boue</td>
|
||||
<td>Huayaco, Derrumbe<br />Aluvión, Huayaco</td></tr>
|
||||
<td>Desprendimiento, Huayaco (LatAm), Derrumbe<br />Aluvión, Huayaco (LatAm)</td></tr>
|
||||
|
||||
<tr><td>Lay away</td>
|
||||
<td></td>
|
||||
@ -389,7 +389,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Ledge</td>
|
||||
<td>Felsvorsprung,<br />brett ?</td>
|
||||
<td>plateforme rocheuse</td>
|
||||
<td>plataforma</td></tr>
|
||||
<td>Plataforma</td></tr>
|
||||
|
||||
<tr><td>Lesser</td>
|
||||
<td>Niedriger</td>
|
||||
@ -399,12 +399,12 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Limestone<br />.. pavement</td>
|
||||
<td>Kalk<br />Karren</td>
|
||||
<td>calcaire<br />Lapies</td>
|
||||
<td>piedra caliza<br />Lapiaz</td></tr>
|
||||
<td>Caliza, Calcárea<br />Lapiaz</td></tr>
|
||||
|
||||
<tr><td>Loose (Chossy)</td>
|
||||
<td>Locker</td>
|
||||
<td>Friable</td>
|
||||
<td>Flojo (Peru)</td></tr>
|
||||
<td>Flojo, Suelto</td></tr>
|
||||
|
||||
<tr><td>Main</td>
|
||||
<td>Haupt</td>
|
||||
@ -434,7 +434,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Mountaineer</td>
|
||||
<td>Bergsteiger</td>
|
||||
<td>Alpiniste</td>
|
||||
<td>Alpinista, Pyreneista Alpiniste</td></tr>
|
||||
<td>Montañero, Alpinista, Pirineísta</td></tr>
|
||||
|
||||
<tr><td>Mud</td>
|
||||
<td>Schlamm, Morast</td>
|
||||
@ -459,17 +459,17 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>On the way</td>
|
||||
<td>Auf dem Weg</td>
|
||||
<td>En route</td>
|
||||
<td></td></tr>
|
||||
<td>En camino</td></tr>
|
||||
|
||||
<tr><td>Overhang<br />roof ..</td>
|
||||
<td>Überhang<br /></td>
|
||||
<td>Surplomb<br /></td>
|
||||
<td>Sobre-calgando<br />Techo</td></tr>
|
||||
<td>Desplome<br />Techo</td></tr>
|
||||
|
||||
<tr><td>Pass, Saddle</td>
|
||||
<td>Pass, Sattel</td>
|
||||
<td>Col</td>
|
||||
<td>Abra, Portachuelo,<br />Collado</td></tr>
|
||||
<td>Paso, Portachuelo,<br />Collado</td></tr>
|
||||
|
||||
<tr><td>Peak<br /><br />(minor)</td>
|
||||
<td>Gipfel, Berg,<br />Spitze<br />Vorgipfel</td>
|
||||
@ -479,22 +479,22 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Pendulum</td>
|
||||
<td></td>
|
||||
<td>Pendule</td>
|
||||
<td></td></tr>
|
||||
<td>Péndulo</td></tr>
|
||||
|
||||
<tr><td>Pillar</td>
|
||||
<td>Pfeiler</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Pilar</td></tr>
|
||||
|
||||
<tr><td>Pinnacle, needle</td>
|
||||
<td>Spitze, Felsturm</td>
|
||||
<td>Gendarme</td>
|
||||
<td>Pináculo, Aguja,<br />Diente, Campanerio</td></tr>
|
||||
<td>Pináculo, Aguja,<br />Diente, Campanario</td></tr>
|
||||
|
||||
<tr><td>Pitch (climbing)</td>
|
||||
<td>Seillänge</td>
|
||||
<td>Longueur</td>
|
||||
<td>Cordada</td></tr>
|
||||
<td>Cordada, Largo</td></tr>
|
||||
|
||||
<tr><td>Pitch (shaft)</td>
|
||||
<td>Schacht</td>
|
||||
@ -504,12 +504,12 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Plain</td>
|
||||
<td>Ebene</td>
|
||||
<td>Plaine</td>
|
||||
<td>Pampa</td></tr>
|
||||
<td>Meseta, Pampa (LatAm)</td></tr>
|
||||
|
||||
<tr><td>Plateau</td>
|
||||
<td>Hochebene. Plateau</td>
|
||||
<td>Plateau</td>
|
||||
<td>Altiplano</td></tr>
|
||||
<td>Altiplano, Meseta</td></tr>
|
||||
|
||||
<tr><td>Point</td>
|
||||
<td>Punkt</td>
|
||||
@ -519,17 +519,17 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Porter</td>
|
||||
<td>Träger</td>
|
||||
<td>Porteur</td>
|
||||
<td>Portador</td></tr>
|
||||
<td>Porteador</td></tr>
|
||||
|
||||
<tr><td>Pothole</td>
|
||||
<td>Schacht</td>
|
||||
<td>Gouffre</td>
|
||||
<td>Pozo, Sotano(Mex)</td></tr>
|
||||
<td>Pozo, Sótano(Mex)</td></tr>
|
||||
|
||||
<tr><td>Rake</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Rastrillo</td></tr>
|
||||
|
||||
<tr><td>Reconnaissance</td>
|
||||
<td>Erkunden</td>
|
||||
@ -539,7 +539,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Return trip</td>
|
||||
<td>Rückweg</td>
|
||||
<td>(Aller-) Retour</td>
|
||||
<td>Viaje de Vuelte</td></tr>
|
||||
<td>Viaje de Vuelta</td></tr>
|
||||
|
||||
<tr><td>Rib</td>
|
||||
<td>Rippe</td>
|
||||
@ -554,7 +554,7 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>River<br />dry/intermittent</td>
|
||||
<td>Fluß<br /></td>
|
||||
<td>Rivière<br /></td>
|
||||
<td>Río<br />Arroyo</td></tr>
|
||||
<td>Río<br />Arroyo, Rambla</td></tr>
|
||||
|
||||
<tr><td>Rock</td>
|
||||
<td>Fels</td>
|
||||
@ -564,12 +564,12 @@ Erst Berichtete Besteigung</td>
|
||||
<tr><td>Rockfall</td>
|
||||
<td>Steinschlag</td>
|
||||
<td>Chute des Rochers,<br />.. des Pierres</td>
|
||||
<td>Caida de Piedra</td></tr>
|
||||
<td>Caída de Piedra</td></tr>
|
||||
|
||||
<tr><td>Roof (overhang)</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Techo</td></tr>
|
||||
<td>Techo, Desplome</td></tr>
|
||||
|
||||
<tr><td>Rope</td>
|
||||
<td>Seil</td>
|
||||
@ -583,12 +583,12 @@ vermutlicher ..<br />Unbekannterweg<br />Variante</td>
|
||||
<td>Voie, Route<br />.. approximative<br />nouvelle ..<br />.. normal<br />
|
||||
.. probable<br />.. inconnue<br />Variante</td>
|
||||
<td>Ruta<br />.. aproximada<br />.. nueva<br />.. normal<br />.. probable<br />
|
||||
.. desconocida<br />Variación</td></tr>
|
||||
.. desconocida<br />Variación, Variante</td></tr>
|
||||
|
||||
<tr><td>Scoop</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Pala</td></tr>
|
||||
|
||||
<tr><td>Scree</td>
|
||||
<td>Schutt, Geröll</td>
|
||||
@ -598,7 +598,7 @@ vermutlicher ..<br />Unbekannterweg<br />Variante</td>
|
||||
<tr><td>Serac</td>
|
||||
<td>Serac, Eisturm</td>
|
||||
<td>Sérac</td>
|
||||
<td>Sérac</td></tr>
|
||||
<td>Serac</td></tr>
|
||||
|
||||
<tr><td>Sink</td>
|
||||
<td></td>
|
||||
@ -608,7 +608,7 @@ vermutlicher ..<br />Unbekannterweg<br />Variante</td>
|
||||
<tr><td>Slab</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Losa</td></tr>
|
||||
|
||||
<tr><td>Sleet</td>
|
||||
<td>Graupeln</td>
|
||||
@ -629,15 +629,15 @@ Windrippung<br />Sulz ..<br /> <br /> <br />Schnee Brett</td>
|
||||
<br />Slush de ..<br />.. Ramollé<br />Croûte Solide<br />
|
||||
Plaque à Vent</td>
|
||||
|
||||
<td>Nieve<br />Costra Frágil<br />Costra<br />Acanalado ?<br />.. Congelado, Helado<br />
|
||||
Neviza<br />.. Nueva<br /> <br />Penitente<br />.. Pulverulenta<br />
|
||||
Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<td>Nieve<br />Costra Frágil<br />Costra<br />Acanalada ?<br />.. Congelada, Helada<br />
|
||||
Neviza<br />.. Nueva<br /> <br />Penitente<br />Polvo<br />
|
||||
Sástrugi<br />Primavera<br /><br />Costra Irrompile<br /></td>
|
||||
</tr>
|
||||
|
||||
<tr><td>Snowline<br />permanent ..<br /> </td>
|
||||
<td>Schneegrenze<br />Ewigen Schnees<br /></td>
|
||||
<td>Limite des Neiges<br />Limite des Neiges<br />Perpetuelles</td>
|
||||
<td>Linea de Nieve<br />Limite de las Nieves<br />Eternas</td></tr>
|
||||
<td>Línea de Nieve<br />Límite de las Nieves<br />Perpetuas</td></tr>
|
||||
|
||||
<tr><td>Spire</td>
|
||||
<td>Spitze, Turm</td>
|
||||
@ -652,12 +652,12 @@ Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<tr><td>Stance</td>
|
||||
<td>Standplatz ?</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Posición</td></tr>
|
||||
|
||||
<tr><td>Steep</td>
|
||||
<td>steil</td>
|
||||
<td>raide, escarpe</td>
|
||||
<td>escarpado, abrupto</td></tr>
|
||||
<td>Escarpado, Abrupto</td></tr>
|
||||
|
||||
<tr><td>Stone</td>
|
||||
<td>Stein</td>
|
||||
@ -667,7 +667,7 @@ Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<tr><td>Stonefall</td>
|
||||
<td>Steinschlag</td>
|
||||
<td>Chutes des Pierres</td>
|
||||
<td></td></tr>
|
||||
<td>Caída de piedras</td></tr>
|
||||
|
||||
<tr><td>Talus</td>
|
||||
<td>Schuttkegel</td>
|
||||
@ -682,7 +682,7 @@ Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<tr><td>Thunderstorm<br />lightning<br />thunder</td>
|
||||
<td>Gewitter<br />Blitz<br />Donner</td>
|
||||
<td>Orage<br />Foudre, éclairs<br />Tonnerre</td>
|
||||
<td><br /><br /></td></tr>
|
||||
<td>Tormenta de truenos<br />Relámpago<br />Trueno</td></tr>
|
||||
|
||||
<tr><td>Torque (verb)</td>
|
||||
<td></td>
|
||||
@ -707,7 +707,7 @@ Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<tr><td>Vertical</td>
|
||||
<td>Senkrecht</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Vertical</td></tr>
|
||||
|
||||
<tr><td>via, by way of</td>
|
||||
<td>Über</td>
|
||||
@ -717,28 +717,28 @@ Sástrugi<br />.. Pastosa<br /><br />Costra Irrompile<br /></td>
|
||||
<tr><td>Wall</td>
|
||||
<td>Wand</td>
|
||||
<td>Mur</td>
|
||||
<td></td></tr>
|
||||
<td>Muro, Pared</td></tr>
|
||||
|
||||
<tr><td>Waterfall</td>
|
||||
<td>Wasserfall</td>
|
||||
<td>Chute d'eau, Cascade</td>
|
||||
<td>Cascada, Salto,<br />Catarata, Chorera</td></tr>
|
||||
<td>Cascada, Salto,<br />Catarata, Chorera (LatAm)</td></tr>
|
||||
|
||||
<tr><td>Weather<br />.. forecast<br /> <br />good.. bad..</td>
|
||||
<td>Wetter<br />Wetterbericht<br />Wettervorhersage<br /> </td>
|
||||
<td>Temps<br />bulletin météorologique<br />previsions mét..s, Météo<br />
|
||||
beau .. mauvais ..</td>
|
||||
<td><br /><br /></td></tr>
|
||||
<td>Tiempo<br />.. predicción<br />bueno.. malo..</td></tr>
|
||||
|
||||
<tr><td>Wedge, jam (verb)</td>
|
||||
<td>Klemmen</td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Cuña</td></tr>
|
||||
|
||||
<tr><td>Wind, windy</td>
|
||||
<td>Wind, windig</td>
|
||||
<td>Vente, venteux</td>
|
||||
<td></td></tr>
|
||||
<td>Viento, Ventoso</td></tr>
|
||||
|
||||
|
||||
<tr><td colspan="4"><b>Equipment:</b></td></tr>
|
||||
@ -747,7 +747,7 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Altimeter</td>
|
||||
<td>Aneroid</td>
|
||||
<td>Altimetre</td>
|
||||
<td></td></tr>
|
||||
<td>Altímetro</td></tr>
|
||||
|
||||
<tr><td>Ascender</td>
|
||||
<td>Steigbugel,<br />Steigklemme</td>
|
||||
@ -757,7 +757,7 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Bolt</td>
|
||||
<td>Bolzen</td>
|
||||
<td>Spit, Piton Gollo</td>
|
||||
<td>Spit (à expansion)</td></tr>
|
||||
<td>Spit (de expansion)</td></tr>
|
||||
|
||||
<tr><td>Bolt/anchor/hanger</td>
|
||||
<td>Bohrhaken</td>
|
||||
@ -767,22 +767,22 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Boots</td>
|
||||
<td>Bergschuhe</td>
|
||||
<td>Chaussures de Montagne</td>
|
||||
<td>Zapatos de Escalada</td></tr>
|
||||
<td>Botas de montaña</td></tr>
|
||||
|
||||
<tr><td>Carabiner</td>
|
||||
<td>Karabiner</td>
|
||||
<td>Mousqueton</td>
|
||||
<td>Mosqueton</td></tr>
|
||||
<td>Mosquetón</td></tr>
|
||||
|
||||
<tr><td>Chalk</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Magnesio</td></tr>
|
||||
|
||||
<tr><td>Chalkbag</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td></tr>
|
||||
<td>Bolsa de magnesio</td></tr>
|
||||
|
||||
<tr><td>Climbing skins</td>
|
||||
<td></td>
|
||||
@ -791,13 +791,13 @@ beau .. mauvais ..</td>
|
||||
|
||||
<tr><td>Compass</td>
|
||||
<td>Kompass</td>
|
||||
<td>boussole, compas</td>
|
||||
<td>brujula (?)</td></tr>
|
||||
<td>Boussole, compas</td>
|
||||
<td>Brújula</td></tr>
|
||||
|
||||
<tr><td>Crampons</td>
|
||||
<td>Steigeisen</td>
|
||||
<td>Crampons</td>
|
||||
<td>Grampones</td></tr>
|
||||
<td>Crampones</td></tr>
|
||||
|
||||
<tr><td>Etrier</td>
|
||||
<td>Trittleiter</td>
|
||||
@ -807,12 +807,12 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Hammer<br />rock ..<br />ice ..<br />north wall ..</td>
|
||||
<td>Hammer<br />Fels..<br />Eis..<br />Pickel-..</td>
|
||||
<td>Marteau<br />.. de Rocher<br />.. à glace<br />Piolet-marteau</td>
|
||||
<td>Martillo<br /><br /><br /></td></tr>
|
||||
<td>Martillo<br />.. de roca<br />.. de hielo<br />Piolet-martillo</td></tr>
|
||||
|
||||
<tr><td>Harness (seat)<br />full body ..</td>
|
||||
<td>Klettersitzgurt<br />Kombiklettergurt</td>
|
||||
<td>Baudrier (cuissard)<br />.. complet</td>
|
||||
<td>Arnes (de Cintura)<br />.. completo</td></tr>
|
||||
<td>Arnés (de Cintura)<br />.. completo</td></tr>
|
||||
|
||||
<tr><td>Head Torch</td>
|
||||
<td>Stirnlampe</td>
|
||||
@ -822,17 +822,17 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Helmet</td>
|
||||
<td>Kopfschutz</td>
|
||||
<td>Casque</td>
|
||||
<td>Casca</td></tr>
|
||||
<td>Casco</td></tr>
|
||||
|
||||
<tr><td>Ice Piton</td>
|
||||
<td>Eishaken</td>
|
||||
<td>Piton à glace</td>
|
||||
<td></td></tr>
|
||||
<td>Clavija de hielo</td></tr>
|
||||
|
||||
<tr><td>Ice Screw</td>
|
||||
<td>Eisschraube</td>
|
||||
<td>Piton à vis</td>
|
||||
<td></td></tr>
|
||||
<td>Tornillo de hielo</td></tr>
|
||||
|
||||
<tr><td>Ice Axe</td>
|
||||
<td>Eispickel</td>
|
||||
@ -847,7 +847,7 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Nut</td>
|
||||
<td>Nute</td>
|
||||
<td>Picoin</td>
|
||||
<td></td></tr>
|
||||
<td>Nudo</td></tr>
|
||||
|
||||
<tr><td>Nut-key</td>
|
||||
<td></td>
|
||||
@ -862,22 +862,22 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Prussik sling</td>
|
||||
<td>Reepschnur,<br />Prusik-Schlinge</td>
|
||||
<td>Anneau à prussik</td>
|
||||
<td></td></tr>
|
||||
<td>Anillo prusik</td></tr>
|
||||
|
||||
<tr><td>Rope<br />climbing ..<br />fixed ..<br />rappel ..</td>
|
||||
<td>Seil<br />Kletterseil<br />Fixes ..<br />Abseil Seil</td>
|
||||
<td>Corde<br />.. d'escalade<br />.. fixe<br />Corde de rappel</td>
|
||||
<td>Cuerda, Soga<br />Soga, Cuerda<br />Cordino, Cuerda fija<br /></td></tr>
|
||||
<td>Cuerda, Soga<br /><br />Cordino, Cuerda fija<br /></td></tr>
|
||||
|
||||
<tr><td>Ski-Bindings<br />(touring)</td>
|
||||
<td>(Touren)Bindung<br />Tourenbindung</td>
|
||||
<td>Fixations<br />(de randonnée alpine)</td>
|
||||
<td>Fijacions<br />(para esqui de montana)</td></tr>
|
||||
<td>Fijaciones<br />(para esquí de montaña)</td></tr>
|
||||
|
||||
<tr><td>Ski-brakes</td>
|
||||
<td>Skistopper</td>
|
||||
<td>Frein-ski</td>
|
||||
<td>Freno-esqui</td></tr>
|
||||
<td>Freno-esquí</td></tr>
|
||||
|
||||
<tr><td>Ski-crampon</td>
|
||||
<td>Harscheisen</td>
|
||||
@ -887,7 +887,7 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Sling</td>
|
||||
<td>Schlinge</td>
|
||||
<td>Anneau de Corde</td>
|
||||
<td></td></tr>
|
||||
<td>Baga</td></tr>
|
||||
|
||||
<tr><td>Snowshovel</td>
|
||||
<td>Schaufel</td>
|
||||
@ -899,12 +899,12 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Left</td>
|
||||
<td>links</td>
|
||||
<td>à gauche</td>
|
||||
<td>izquierda</td></tr>
|
||||
<td>Izquierda</td></tr>
|
||||
|
||||
<tr><td>Right</td>
|
||||
<td>rechts</td>
|
||||
<td>à droite</td>
|
||||
<td>derecho</td></tr>
|
||||
<td>Derecha</td></tr>
|
||||
|
||||
<tr><td>North</td>
|
||||
<td>Norden</td>
|
||||
@ -929,22 +929,22 @@ beau .. mauvais ..</td>
|
||||
<tr><td>Up</td>
|
||||
<td>(hinauf)</td>
|
||||
<td>en montant</td>
|
||||
<td></td></tr>
|
||||
<td>Arriba</td></tr>
|
||||
|
||||
<tr><td>Down</td>
|
||||
<td>hinab</td>
|
||||
<td>en bas</td>
|
||||
<td></td></tr>
|
||||
<td>Abajo</td></tr>
|
||||
|
||||
<tr><td>Upstream</td>
|
||||
<td>stromaufwarts</td>
|
||||
<td>à mont</td>
|
||||
<td>Rio arriba</td></tr>
|
||||
<td>Río arriba</td></tr>
|
||||
|
||||
<tr><td>Downstream</td>
|
||||
<td>flußabwarts</td>
|
||||
<td>à val</td>
|
||||
<td>Rio</td></tr>
|
||||
<td>Río abajo</td></tr>
|
||||
</table>
|
||||
|
||||
<h4>Acknowledgements:</h4>
|
||||
|
||||
BIN
images/style/bg-cambridge-caving-expedition.png
Normal file
BIN
images/style/bg-cambridge-caving-expedition.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 221 B |
BIN
images/style/menu-main.png
Normal file
BIN
images/style/menu-main.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
images/style/menu-second.png
Normal file
BIN
images/style/menu-second.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
@ -90,7 +90,7 @@ authors</a>.</p>
|
||||
|
||||
<!-- LINKS -->
|
||||
<ul id="links">
|
||||
<li>Back to <a href="../index.htm">CUCC Home page</a></li>
|
||||
<li>Back to <a href="./index.htm">CUCC Home page</a></li>
|
||||
<li><b>Main Indices:</b>
|
||||
<ul>
|
||||
<li><a href="infodx.htm"><b>Index</b> to Expo</a> information pages</li>
|
||||
@ -16,7 +16,7 @@ figure of Jenny Black at the entrance.</p>
|
||||
<p class="caption">Photo © Olly Betts, 2006</p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../186/186.html">186 description</a></li>
|
||||
<li><a href="../2006-72/2006-72.html">2006-72 description</a></li>
|
||||
<li><a href="../index.html">Kratzer Valley area</a></li>
|
||||
|
||||
@ -16,7 +16,7 @@ Fledermaushöhle - 1623/71
|
||||
scanned on Nikon Coolscan II 800x600 at 675 dpi, 1997.08.12, AERW -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../71.htm">Back to cave description</a></li>
|
||||
<li><a href="../index.html">Kratzer Valley description</a></li>
|
||||
<li><a href="../../index.htm">Back to Expedition Intro page</a>
|
||||
|
||||
@ -16,7 +16,7 @@ Fledermaushöhle - 1623/71
|
||||
scanned on Nikon Coolscan II 800x600 at 675 dpi, 1997.08.12, AERW -->
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../71.htm">Back to cave description</a></li>
|
||||
<li><a href="../index.html">Kratzer Valley description</a></li>
|
||||
<li><a href="../../index.htm">Back to Expedition Intro page</a>
|
||||
|
||||
@ -84,7 +84,7 @@ last part of toll road</h4>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../indxal.htm">Full Index to 1623</a></li>
|
||||
<li><a href="../areas.htm">1623 Area/Subarea description</a></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
|
||||
@ -18,7 +18,7 @@ typical browser window.</p>
|
||||
<p><a href="../years/1987/geolog.htm">Original article</a></p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../plateau/index.html">Plateau description</a></li>
|
||||
<li><a href="../areas.htm">1623 Area/Subarea description</a></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
|
||||
@ -30,7 +30,7 @@ system, there are a number of smaller caves which have not (so far) been connect
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="index.html">Back to area description</a></li>
|
||||
<li><a href="../indxal.htm">Full Index</a></li>
|
||||
<li><a href="../areas.htm">Other Areas</a></li>
|
||||
|
||||
@ -50,7 +50,7 @@ Alm.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../indxal.htm">Full Index to 1623</a></li>
|
||||
<li><a href="../areas.htm">1623 Area/Subarea description</a></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
|
||||
@ -49,7 +49,7 @@ some way before realising the error.</p>
|
||||
<destination dest="kratzer/index.html" />
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a>
|
||||
<ul>
|
||||
<li><a href="../indxal.htm">Full Index</a></li>
|
||||
|
||||
@ -95,7 +95,7 @@ work.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a>
|
||||
<ul>
|
||||
<li><a href="../indxal.htm">Full Index</a></li>
|
||||
|
||||
@ -47,7 +47,7 @@ BS17, whose description is included here.</p>
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../indxal.htm">Full Index to 1623</a></li>
|
||||
<li><a href="../areas.htm">1623 Area/Subarea description</a></li>
|
||||
<li><a href="../1626/index.html">Adjacent area 1626</a></li>
|
||||
|
||||
@ -79,7 +79,7 @@ recently discovered 161g and 161h entrances.</li>
|
||||
<hr />
|
||||
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../indxal.htm">Full Index</a> to caves in all areas</li>
|
||||
<li><a href="../areas.htm">Other Areas</a></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
|
||||
@ -40,7 +40,7 @@ entrance.
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="index.html">Back to area description</a></li>
|
||||
<li><a href="../indxal.htm">Full Index</a></li>
|
||||
<li><a href="../areas.htm">Other Areas</a></li>
|
||||
|
||||
@ -40,7 +40,7 @@ exploratory effort anywhere in the area.
|
||||
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../indxal.htm">Full Index to 1623</a></li>
|
||||
<li><a href="../areas.htm">1623 Area/Subarea description</a></li>
|
||||
<li><a href="../index.htm">Back to Expedition Intro page</a></li>
|
||||
|
||||
15
noinfo/cavestats.build
Normal file
15
noinfo/cavestats.build
Normal file
@ -0,0 +1,15 @@
|
||||
#How to build cavestats binary
|
||||
|
||||
apt-get source survex
|
||||
sudo apt-get build-dep survex
|
||||
pushd
|
||||
cp cavestats.c survex-*/src
|
||||
cd survex-*
|
||||
dpkg-buildpackage
|
||||
cd src
|
||||
gcc -DHAVE_CONFIG_H -I. -I.. -DIMG_HOSTED -Wall -W -Wunused -Wshadow
|
||||
-Wpointer-arith -Wmissing-prototypes -Wwrite-strings
|
||||
-Wredundant-decls -Wnested-externs -Wcast-align -g -O2 -O2 -MT
|
||||
3dtopos.o -MD -MP namecmp.o img.o useful.o cmdline.o message.o
|
||||
filename.o osdepend.o z_getopt.o getopt1.o -o cavestats cavestats.c -lm
|
||||
mv cavestats ../../
|
||||
BIN
noinfo/cavestats_i386
Executable file
BIN
noinfo/cavestats_i386
Executable file
Binary file not shown.
@ -87,6 +87,10 @@ def parse_csvfile():
|
||||
|
||||
# Main routine:
|
||||
|
||||
if (not os.access('CS_BINARY', os.X_OK)):
|
||||
print "%s not executable - skipping %s" % (CS_BINARY, __file__)
|
||||
exit(1)
|
||||
|
||||
caveslist = parse_csvfile()
|
||||
|
||||
dplong = file("dplong.htm", "w")
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
"Tim Farrar","Farrar",,,"i/tim_farrar.jpg",,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
|
||||
"Simon Farrow","Farrow",,,"l/simonf.htm",,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
|
||||
"Andy Farrow","Farrow",,,"i/andy_farrow.jpg",,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,
|
||||
"David Fearon","Fearon",,,"i/davef.jpg",,,,,,,,,,,,,,,1,,1,,,,1,,,,,,,,,,,,,
|
||||
"David Fearon (Damage)","Fearon",,,"i/davef.jpg",,,,,,,,,,,,,,,1,,1,,,,1,,,,,,,,,,,,,
|
||||
"Mark Fearon","Fearon",,,"l/markf.htm",,,,,,,,,,,,,1,1,1,1,,,,,1,,,,,,,,,,,,,
|
||||
"Aggy Finn","Finn",,,"i/aggy_finn.jpg",,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
|
||||
"Doug Florence","Florence",,,"l/dougf.htm",,,1,,,,1,,,,,,,-1,,,,,,,,,,,,,,,,,,,,
|
||||
@ -70,7 +70,7 @@
|
||||
"Andy Goddard","Goddard",1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,
|
||||
"Judith Greaves","Greaves",,,"i/judith.jpg",,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
|
||||
"Hilary Greaves (Hils)","Greaves",1,,"i/hilary_greaves.jpg",,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,
|
||||
"Martin Green","Green",,,"i/marting.jpg",,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,1,,
|
||||
"Martin Green","Green",,,"i/marting.jpg",,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,1,,1
|
||||
"Naomi Griffiths","Griffiths",,,"i/naomi.jpg",,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
|
||||
"Julian Griffiths","Griffiths",,,,,1,1,1,1,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
|
||||
"Julian Haines","Haines",,1,"i/haines.jpg",,,,,,,,,,,,,,,,1,1,1,1,1,1,1,1,1,,,,1,,,,,,
|
||||
@ -231,3 +231,4 @@
|
||||
"Holly Bradley","Bradley",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
|
||||
"Noel Snape","Snape",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
|
||||
"Gareth Phillips","Phillips",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
|
||||
"Jess Hatchett","Hatchett",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
|
||||
|
||||
|
@ -265,7 +265,7 @@ sub do_this_line {
|
||||
$path =~ s/\/$fn//g;
|
||||
|
||||
# Make the directory that the file is in, in case it doesn't exist yet
|
||||
#mkpath($path);
|
||||
mkpath($path);
|
||||
# this is considered harmful now creation of directories is versioned - DL
|
||||
|
||||
# Open the file and start writing to it
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>
|
||||
<a href="../../../smkridge/index.html#id116">Schwarzmooskogel area</a> index and description
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li>
|
||||
<a href="../../../smkridge/index.html#id116">Schwarzmooskogel area</a> index and description
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ R.D.Craig</dd>
|
||||
</dl>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../../indxal.htm">Index</a> of all caves documented in
|
||||
1623.</li>
|
||||
<li><a href="../../areas.htm">Overview</a> of area 1623</li>
|
||||
|
||||
@ -50,7 +50,7 @@ trouve à -854m, donc à l'altitude 756m, niveau de la
|
||||
vallée.</p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="index.htm">GSAB articles list</a></li>
|
||||
<li>Trunkemboldschacht : <a href=
|
||||
"../../noinfo/1626/117.htm">description</a>, in English</li>
|
||||
|
||||
@ -192,7 +192,7 @@ objective compared with other Austrian possibilities.</p>
|
||||
<p lang="fr" xml:lang="fr">G Feller <acronym>GSAB</acronym></p>
|
||||
<hr />
|
||||
<!-- LINKS -->
|
||||
<ul>
|
||||
<ul id="links">
|
||||
<li><a href="../index.htm">GSAB articles list</a></li>
|
||||
<li><span lang="fr" xml:lang="fr">Gouffre Ovni</span> : <a href=
|
||||
"../../../noinfo/1626/122.htm">description</a>, in English</li>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user