1 \documentclass[a4paper,leqno]{strayman}
3 \let\numberwithin=\notdef
15 \rfoot[\thepage]{\input{revid.inc}}
16 \lfoot[\input{revid.inc}]{\thepage}
18 \let\stdsection\section
19 \renewcommand\section{\newpage\stdsection}
21 \renewcommand{\ge}{\geqslant}
22 \renewcommand{\le}{\leqslant}
23 \newcommand{\nge}{\ngeqslant}
24 \newcommand{\nle}{\nleqslant}
26 \newcommand{\has}{\sqsupseteq}
27 \newcommand{\isin}{\sqsubseteq}
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}}
36 \newif\ifhidehack\hidehackfalse
37 \DeclareRobustCommand\hidefromedef[2]{%
38 \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
39 \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
41 \newcommand{\set}[1]{\mathbb{#1}}
42 \newcommand{\pay}[1]{\pa{#1}^+}
43 \newcommand{\pan}[1]{\pa{#1}^-}
45 \newcommand{\p}{\pa{P}}
46 \newcommand{\py}{\pay{P}}
47 \newcommand{\pn}{\pan{P}}
49 \newcommand{\pc}{\pa{C}}
50 \newcommand{\pcy}{\pay{C}}
51 \newcommand{\pcn}{\pan{C}}
53 \newcommand{\pl}{\pa{L}}
54 \newcommand{\ply}{\pay{L}}
55 \newcommand{\pln}{\pan{L}}
57 \newcommand{\pq}{\pa{Q}}
58 \newcommand{\pqy}{\pay{Q}}
59 \newcommand{\pqn}{\pan{Q}}
61 \newcommand{\pr}{\pa{R}}
62 \newcommand{\pry}{\pay{R}}
63 \newcommand{\prn}{\pan{R}}
65 %\newcommand{\hasparents}{\underaccent{1}{>}}
66 %\newcommand{\hasparents}{{%
67 % \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
68 \newcommand{\hasparents}{>_{\mkern-7.0mu _{1:}}}
69 \newcommand{\areparents}{<_{\mkern-14.0mu _{1:}\mkern+5.0mu}}
71 \renewcommand{\implies}{\Rightarrow}
72 \renewcommand{\equiv}{\Leftrightarrow}
73 \renewcommand{\nequiv}{\nLeftrightarrow}
74 \renewcommand{\land}{\wedge}
75 \renewcommand{\lor}{\vee}
77 \newcommand{\pancs}{{\mathcal A}}
78 \newcommand{\pends}{{\mathcal E}}
80 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
81 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
83 \newcommand{\merge}{{\mathcal M}}
84 \newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
85 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
87 \newcommand{\patch}{{\mathcal P}}
88 \newcommand{\base}{{\mathcal B}}
89 \newcommand{\depsreq}{{\mathcal D}}
91 \newcommand{\patchof}[1]{\patch ( #1 ) }
92 \newcommand{\baseof}[1]{\base ( #1 ) }
93 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
95 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
96 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
98 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
99 \newcommand{\hasdep}{\succ}
100 \newcommand{\isdep}{\prec}
102 \newcommand{\grefzc}{ T^0_{\pc} }
103 \newcommand{\grefcc}{ T_{\pc} }
104 \newcommand{\grefuc}{ T'_{\pc} }
105 \newcommand{\greffc}{ T^*_{\pc} }
107 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
108 \newcommand{\bigforall}{%
110 {\hbox{\huge$\forall$}}%
111 {\hbox{\Large$\forall$}}%
112 {\hbox{\normalsize$\forall$}}%
113 {\hbox{\scriptsize$\forall$}}}%
115 \newcommand{\bigexists}{%
117 {\hbox{\huge$\exists$}}%
118 {\hbox{\Large$\exists$}}%
119 {\hbox{\normalsize$\exists$}}%
120 {\hbox{\scriptsize$\exists$}}}%
123 \newcommand{\Largeexists}{\mathop{\hbox{\Large$\exists$}}}
124 \newcommand{\Largenexists}{\mathop{\hbox{\Large$\nexists$}}}
126 \newcommand{\qed}{\square}
127 \newcommand{\proofstarts}{{\it Proof:}}
128 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
130 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
131 \newcommand{\gathnext}{\\ \tag*{}}
133 \newcommand{\true}{t}
134 \newcommand{\false}{f}
141 \input{invariants.tex}
143 \input{annotations.tex}
146 \input{create-base.tex}
147 \input{create-tip.tex}
148 \input{anticommit.tex}
151 \chapter{Merge strategy}