chiark / gitweb /
merge: fix dependency reinsertion blurb to mention the need for the base to be merged...
[topbloke-formulae.git] / article.tex
1 \documentclass[a4paper,leqno]{strayman}
2 \errorcontextlines=50
3 \let\numberwithin=\notdef
4 \usepackage{amsmath}
5 \usepackage{mathabx}
6 \usepackage{txfonts}
7 \usepackage{amsfonts}
8 \usepackage{mdwlist}
9 %\usepackage{accents}
10
11 \usepackage{fancyhdr}
12 \pagestyle{fancy}
13 \rhead[\rightmark]{}
14 \lhead[]{\rightmark}
15 \rfoot[\thepage]{\input{revid.inc}}
16 \lfoot[\input{revid.inc}]{\thepage}
17
18 \let\stdsection\section
19 \renewcommand\section{\newpage\stdsection}
20
21 \renewcommand{\ge}{\geqslant}
22 \renewcommand{\le}{\leqslant}
23 \newcommand{\nge}{\ngeqslant}
24 \newcommand{\nle}{\nleqslant}
25
26 \newcommand{\has}{\sqsupseteq}
27 \newcommand{\isin}{\sqsubseteq}
28
29 \newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
30 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
31 \newcommand{\haspatch}{\sqSupset}
32 \newcommand{\patchisin}{\sqSubset}
33 %\newcommand{\zhaspatch}{\mathrel{\underset{\fullmoon}\sqSupset}}
34 \newcommand{\zhaspatch}{\mathrel{\sqSupset_\varnothing\mkern-4mu}}
35
36         \newif\ifhidehack\hidehackfalse
37         \DeclareRobustCommand\hidefromedef[2]{%
38           \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
39         \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
40
41 \newcommand{\set}[1]{\mathbb{#1}}
42 \newcommand{\pay}[1]{\pa{#1}^+}
43 \newcommand{\pan}[1]{\pa{#1}^-}
44
45 \newcommand{\p}{\pa{P}}
46 \newcommand{\py}{\pay{P}}
47 \newcommand{\pn}{\pan{P}}
48
49 \newcommand{\pl}{\pa{L}}
50 \newcommand{\ply}{\pay{L}}
51 \newcommand{\pln}{\pan{L}}
52
53 \newcommand{\pq}{\pa{Q}}
54 \newcommand{\pqy}{\pay{Q}}
55 \newcommand{\pqn}{\pan{Q}}
56
57 \newcommand{\pr}{\pa{R}}
58 \newcommand{\pry}{\pay{R}}
59 \newcommand{\prn}{\pan{R}}
60
61 %\newcommand{\hasparents}{\underaccent{1}{>}}
62 %\newcommand{\hasparents}{{%
63 %  \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
64 \newcommand{\hasparents}{>_{\mkern-7.0mu _1}}
65 \newcommand{\areparents}{<_{\mkern-14.0mu _1\mkern+5.0mu}}
66
67 \renewcommand{\implies}{\Rightarrow}
68 \renewcommand{\equiv}{\Leftrightarrow}
69 \renewcommand{\nequiv}{\nLeftrightarrow}
70 \renewcommand{\land}{\wedge}
71 \renewcommand{\lor}{\vee}
72
73 \newcommand{\pancs}{{\mathcal A}}
74 \newcommand{\pends}{{\mathcal E}}
75
76 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
77 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
78
79 \newcommand{\merge}{{\mathcal M}}
80 \newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
81 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
82
83 \newcommand{\patch}{{\mathcal P}}
84 \newcommand{\base}{{\mathcal B}}
85
86 \newcommand{\patchof}[1]{\patch ( #1 ) }
87 \newcommand{\baseof}[1]{\base ( #1 ) }
88
89 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
90 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
91
92 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
93 \newcommand{\bigforall}{%
94   \mathop{\mathchoice%
95     {\hbox{\huge$\forall$}}%
96     {\hbox{\Large$\forall$}}%
97     {\hbox{\normalsize$\forall$}}%
98     {\hbox{\scriptsize$\forall$}}}%
99 }
100 \newcommand{\bigexists}{%
101   \mathop{\mathchoice%
102     {\hbox{\huge$\exists$}}%
103     {\hbox{\Large$\exists$}}%
104     {\hbox{\normalsize$\exists$}}%
105     {\hbox{\scriptsize$\exists$}}}%
106 }
107
108 \newcommand{\Largeexists}{\mathop{\hbox{\Large$\exists$}}}
109 \newcommand{\Largenexists}{\mathop{\hbox{\Large$\nexists$}}}
110
111 \newcommand{\qed}{\square}
112 \newcommand{\proofstarts}{{\it Proof:}}
113 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
114
115 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
116 \newcommand{\gathnext}{\\ \tag*{}}
117
118 \newcommand{\true}{t}
119 \newcommand{\false}{f}
120
121 \begin{document}
122
123 \input{notation.tex}
124 \input{invariants.tex}
125 \input{lemmas.tex}
126 \input{annotations.tex}
127
128 \input{simple.tex}
129 \input{create-base.tex}
130 \input{create-tip.tex}
131 \input{anticommit.tex}
132 \input{merge.tex}
133
134 \end{document}