-/// move_from_uci() takes a position and a string as input, and attempts to
-/// convert the string to a move, using simple coordinate notation (g1f3,
-/// a7a8q, etc.). In order to correctly parse en passant captures and castling
-/// moves, we need the position. This function is not robust, and expects that
-/// the input move is legal and correctly formatted.
+/// move_to_uci() converts a move to a string in coordinate notation
+/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
+/// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
+/// Chess960 mode.
+
+const std::string move_to_uci(Move m, bool chess960) {
+
+ std::string promotion;
+ Square from = move_from(m);
+ Square to = move_to(m);
+
+ if (m == MOVE_NONE)
+ return "(none)";
+
+ if (m == MOVE_NULL)
+ return "0000";
+
+ if (move_is_short_castle(m) && !chess960)
+ return from == SQ_E1 ? "e1g1" : "e8g8";
+
+ if (move_is_long_castle(m) && !chess960)
+ return from == SQ_E1 ? "e1c1" : "e8c8";
+
+ if (move_is_promotion(m))
+ promotion = char(tolower(piece_type_to_char(move_promotion_piece(m))));
+
+ return square_to_string(from) + square_to_string(to) + promotion;
+}
+
+
+/// move_from_uci() takes a position and a string representing a move in
+/// simple coordinate notation and returns an equivalent Move.