From: Ian Jackson Date: Thu, 1 Mar 2012 00:04:45 +0000 (+0000) Subject: nice formatting for notation X-Git-Tag: f0.2~206 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=93658ccf74d659dfcc2f00c6c29928804aa68600 nice formatting for notation --- diff --git a/article.tex b/article.tex index cf68f31..ac351fb 100644 --- a/article.tex +++ b/article.tex @@ -5,6 +5,7 @@ \usepackage{slashed} \usepackage{txfonts} \usepackage{amsfonts} +\usepackage{mdwlist} %\usepackage{accents} \renewcommand{\ge}{\geqslant} @@ -44,14 +45,21 @@ \section{Notation} -$ C \hasparents \set X $ The parents of commit $C$ are exactly the set +\begin{basedescript}{ +\desclabelwidth{5em} +\desclabelstyle{\nextlinelabel} +} +\item[ $ C \hasparents \set X $ ] +The parents of commit $C$ are exactly the set $\set X$. -$ C \ge D $ $C$ is a descendant of $D$ in the git commit +\item[ $ C \ge D $ ] +$C$ is a descendant of $D$ in the git commit graph. This is a partial order, namely the transitive closure of $ D \in \set X $ where $ C \hasparents \set X $. -$ C \has D $ Informally, the tree at commit $C$ contains the change +\item[ $ C \has D $ ] +Informally, the tree at commit $C$ contains the change made in commit $D$. Does not take account of deliberate reversions by the user or in non-Topbloke-controlled branches; these are considered normal, forward, commits. For merges and Topbloke-generated @@ -59,6 +67,8 @@ anticommits, the ``change made'' is only to be thought of as any conflict resolution. This is not a partial order because it is not transitive. +\end{basedescript} + \section{Invariants} No replay: \[ C \has D \implies C \ge D \]