chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strategy: use \chapter
[topbloke-formulae.git]
/
article.tex
diff --git
a/article.tex
b/article.tex
index 9cdd0d2fc4265123a503a43a8eea598faa9c295d..198ced4b05e9700e0a4e5ac41b07e0e8dad1c631 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-86,9
+86,11
@@
\newcommand{\patch}{{\mathcal P}}
\newcommand{\base}{{\mathcal B}}
\newcommand{\patch}{{\mathcal P}}
\newcommand{\base}{{\mathcal B}}
+\newcommand{\depsreq}{{\mathcal D}}
\newcommand{\patchof}[1]{\patch ( #1 ) }
\newcommand{\baseof}[1]{\base ( #1 ) }
\newcommand{\patchof}[1]{\patch ( #1 ) }
\newcommand{\baseof}[1]{\base ( #1 ) }
+\newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
\newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
\newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
\newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
\newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
@@
-124,6
+126,8
@@
\begin{document}
\begin{document}
+\chapter{Data model}
+
\input{notation.tex}
\input{invariants.tex}
\input{lemmas.tex}
\input{notation.tex}
\input{invariants.tex}
\input{lemmas.tex}
@@
-135,4
+139,8
@@
\input{anticommit.tex}
\input{merge.tex}
\input{anticommit.tex}
\input{merge.tex}
+\chapter{Merge strategy}
+
+\input{strategy.tex}
+
\end{document}
\end{document}