Merge branch 'master' (sigh) of git.ucc.asn.au:ipdf/documents

Conflicts:
	papers.bib

diff --cc LitReviewDavid.pdf
index 9c5d4ec,5274454..f7333a0
Binary files differ

diff --cc papers.bib
index 2a12d2f,379816d..cdace1e
--- 1/papers.bib
--- 2/papers.bib
+++ b/papers.bib
@@@ -1051,30 -1041,61 +1051,89 @@@ ISSN={0272-1716},
    number={3},
  }
  
- }
 +@book{de1986shape,
 +  title={Shape mathematics and CAD},
 +  author={De Casteljau, Paul de Faget},
 +  year={1986},
 +  publisher={IET}
 +}
 +
 +@book{foley1996computer,
 +  title={Computer Graphics: Principles and Practice},
 +  author={Foley, J.D.},
 +  isbn={9780201848403},
 +  lccn={lc95013631},
 +  chapter={Representing Curves and Surfaces}
 +  series={Addison-Wesley systems programming series},
 +  url={http://books.google.com.au/books?id=-4ngT05gmAQC},
 +  year={1996},
 +  publisher={Addison-Wesley}
 +}
 +
 +@book{zerbst2004game,
 +  title={{3D} Game Engine Programming},
 +  author={Zerbst, Stefan and Düvel, Oliver},
 +  publisher={Premier Press},
 +  chapter={Scene Management},
 +  isbn={1592003516}
 +  year={2004}
++}
++
+ @book{knuth1983metafont,
+       author = "Donald Knuth",
+       year = 1983,
+       title = "The {METAFONT} Book",
+       publisher = "Addison-Wesley",
+       edition = 2
+ }
+ 
+ @book{knuth1984texbook,
+       author = "Donald Knuth",
+       year = 1983,
+       title = "The {\TeX} Book",
+       publisher = "Addison-Wesley",
+       edition = 2
+ }
+ 
+ %Bezier:1986:PVP:988594.988595,
+ @article{bezier1986apersonal,
+  author = {B{\'e}zier, Pierre E.},
+  title = {A Personal View of Progress in Computer Aided Design},
+  journal = {SIGGRAPH Comput. Graph.},
+  issue_date = {July 1986},
+  volume = {20},
+  number = {3},
+  month = jul,
+  year = {1986},
+  issn = {0097-8930},
+  pages = {154--159},
+  numpages = {6},
+  url = {http://doi.acm.org.ezproxy.library.uwa.edu.au/10.1145/988594.988595},
+  doi = {10.1145/988594.988595},
+  acmid = {988595},
+  publisher = {ACM},
+  address = {New York, NY, USA},
+ } 
+ 
+ % ECMAscript (Javascript) (sorry David I had to do it)
+ @book{ecma-262,
+       title = "ECMAScript Language Specification",
+       year = 2011,
+       month = "June",
+       edition = "5.1",
+       publisher = {\url{http://www.ecma-international.org} accessed 2014-05-22},
+       author = "ECMA International"
+ }
+ 
+ @ARTICLE{randell1982fromanalytical,
+ author={Randell, B.},
+ journal={Annals of the History of Computing},
+ title={From Analytical Engine to Electronic Digital Computer: The Contributions of Ludgate, Torres, and Bush},
+ year={1982},
+ month={Oct},
+ volume={4},
+ number={4},
+ pages={327-341},
+ keywords={Calculators;Character recognition;Engine cylinders;Engineering drawings;Hardware;History;Information analysis;Information processing;Permission;Time sharing computer systems},
+ doi={10.1109/MAHC.1982.10042},
+ ISSN={0164-1239},}