From a380526f1251a9f42f6077e2bdf79140aafd4e9e Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <microdan@gmail.com>
Date: Tue, 23 Aug 2005 19:02:00 +0000
Subject: [PATCH] updating CHANGES.html

---
 CHANGES.html                   | 8 +++++++-
 contrib/algebra/parse-k.factor | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 19f0dbe12c..7266cd6c57 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -23,7 +23,7 @@
 
 <ul>
 <li><code>2each ( seq seq quot -- quot: elt -- elt )</code> combinator</li>
-<li><code>join ( seq glue -- seq )</code> combinator. Takes a sequence of sequences, and constructs a new sequence with the glue in between each sequence. For example:
+<li><code>join ( seq glue -- seq )</code> word. Takes a sequence of sequences, and constructs a new sequence with the glue in between each sequence. For example:
 <pre>  [ "usr" "bin" "grep" ] "/" join
 <b>"usr/bin/grep"</b></pre></li>
 <li>Integers now support the sequence protocol. An integer is an increasing sequence of its predecessors. This means the <code>count ( n -- [ 0 ... n-1 ] )</code> word is gone; just use <code>&gt;vector</code> instead. Also, <code>project</code> has been made redundant by <code>map</code>.</li>
@@ -53,6 +53,11 @@
 <li>More descriptive "out of bounds" errors.</li>
 <li>New <code>with-datastack ( stack word -- stack )</code> combinator.</li>
 <li>New <code>cond ( conditions -- )</code> combinator. It behaves like a set of nested <code>ifte</code>s; see its documentation comment for details. Note that it does not compile.</li>
+<li>Completely redid infix algebra in <code>conrib/algebra/</code>. Now, vector operations are possible
+and the syntax doesn't use so many spaces. New way to write the quadratic formula:
+<pre>MATH: quadratic[a;b;c] =
+    plusmin[(-b)/2*a;(sqrt(b^2)-4*a*c)/2*a] ;</pre>
+(Daniel Ehrenberg)</li>
 </ul>
 
 </li>
@@ -172,6 +177,7 @@ write1 ( char -- )</pre>
 
 <li>md5 hashing algorithm in <code>contrib/crypto/</code> (Doug Coleman).
 
+
 </ul>
 
 </ul>
diff --git a/contrib/algebra/parse-k.factor b/contrib/algebra/parse-k.factor
index d9a73c2827..7902a63de3 100644
--- a/contrib/algebra/parse-k.factor
+++ b/contrib/algebra/parse-k.factor
@@ -1,4 +1,4 @@
-IN: parse-k
+IN: infix
 USING: sequences kernel math strings combinators namespaces prettyprint io inspector
        errors parser generic lists kernel-internals hashtables words vectors ;
        ! remove: inspector