merge duration, mduration #44

merge price, yield #29

merge fvschedule #56

merge pricedisc, pricemat, yielddisc, yieldmat, disc, received, intrate #57

merge accrint, accrintm #58

merge coupdaybs, coupdays, coupdaysnc, coupncd, coupnum, couppcd #59

fix cursor

refactor

refactor

fix build

base/src/expressions/parser/static_analysis.rs

@@ -550,6 +550,14 @@ fn args_signature_irr(arg_count: usize) -> Vec<Signature> {
     }
 }
 
+fn args_signature_fvschedule(arg_count: usize) -> Vec<Signature> {
+    if arg_count == 2 {
+        vec![Signature::Scalar, Signature::Vector]
+    } else {
+        vec![Signature::Error; arg_count]
+    }
+}
+
 fn args_signature_xirr(arg_count: usize) -> Vec<Signature> {
     if arg_count == 2 {
         vec![Signature::Vector; arg_count]
@@ -752,6 +760,7 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Dollarfr => args_signature_scalars(arg_count, 2, 0),
         Function::Effect => args_signature_scalars(arg_count, 2, 0),
         Function::Fv => args_signature_scalars(arg_count, 3, 2),
+        Function::Fvschedule => args_signature_fvschedule(arg_count),
         Function::Ipmt => args_signature_scalars(arg_count, 4, 2),
         Function::Irr => args_signature_irr(arg_count),
         Function::Ispmt => args_signature_scalars(arg_count, 4, 0),
@@ -759,9 +768,20 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Nominal => args_signature_scalars(arg_count, 2, 0),
         Function::Nper => args_signature_scalars(arg_count, 3, 2),
         Function::Npv => args_signature_npv(arg_count),
+        Function::Duration => args_signature_scalars(arg_count, 5, 1),
+        Function::Mduration => args_signature_scalars(arg_count, 5, 1),
         Function::Pduration => args_signature_scalars(arg_count, 3, 0),
+        Function::Accrint => args_signature_scalars(arg_count, 6, 2),
+        Function::Accrintm => args_signature_scalars(arg_count, 4, 1),
+        Function::Coupdaybs => args_signature_scalars(arg_count, 3, 1),
+        Function::Coupdays => args_signature_scalars(arg_count, 3, 1),
+        Function::Coupdaysnc => args_signature_scalars(arg_count, 3, 1),
+        Function::Coupncd => args_signature_scalars(arg_count, 3, 1),
+        Function::Coupnum => args_signature_scalars(arg_count, 3, 1),
+        Function::Couppcd => args_signature_scalars(arg_count, 3, 1),
         Function::Pmt => args_signature_scalars(arg_count, 3, 2),
         Function::Ppmt => args_signature_scalars(arg_count, 4, 2),
+        Function::Price => args_signature_scalars(arg_count, 6, 1),
         Function::Pv => args_signature_scalars(arg_count, 3, 2),
         Function::Rate => args_signature_scalars(arg_count, 3, 3),
         Function::Rri => args_signature_scalars(arg_count, 3, 0),
@@ -770,6 +790,14 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Tbilleq => args_signature_scalars(arg_count, 3, 0),
         Function::Tbillprice => args_signature_scalars(arg_count, 3, 0),
         Function::Tbillyield => args_signature_scalars(arg_count, 3, 0),
+        Function::Yield => args_signature_scalars(arg_count, 6, 1),
+        Function::Pricedisc => args_signature_scalars(arg_count, 4, 1),
+        Function::Pricemat => args_signature_scalars(arg_count, 5, 1),
+        Function::Yielddisc => args_signature_scalars(arg_count, 4, 1),
+        Function::Yieldmat => args_signature_scalars(arg_count, 5, 1),
+        Function::Disc => args_signature_scalars(arg_count, 4, 1),
+        Function::Received => args_signature_scalars(arg_count, 4, 1),
+        Function::Intrate => args_signature_scalars(arg_count, 4, 1),
         Function::Xirr => args_signature_xirr(arg_count),
         Function::Xnpv => args_signature_xnpv(arg_count),
         Function::Besseli => args_signature_scalars(arg_count, 2, 0),
@@ -834,6 +862,48 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Geomean => vec![Signature::Vector; arg_count],
         Function::Networkdays => args_signature_networkdays(arg_count),
         Function::NetworkdaysIntl => args_signature_networkdays_intl(arg_count),
+        Function::Acot => args_signature_scalars(arg_count, 1, 0),
+        Function::Acoth => args_signature_scalars(arg_count, 1, 0),
+        Function::Cot => args_signature_scalars(arg_count, 1, 0),
+        Function::Coth => args_signature_scalars(arg_count, 1, 0),
+        Function::Csc => args_signature_scalars(arg_count, 1, 0),
+        Function::Csch => args_signature_scalars(arg_count, 1, 0),
+        Function::Sec => args_signature_scalars(arg_count, 1, 0),
+        Function::Sech => args_signature_scalars(arg_count, 1, 0),
+        Function::Exp => args_signature_scalars(arg_count, 1, 0),
+        Function::Fact => args_signature_scalars(arg_count, 1, 0),
+        Function::Factdouble => args_signature_scalars(arg_count, 1, 0),
+        Function::Sign => args_signature_scalars(arg_count, 1, 0),
+        Function::Radians => args_signature_scalars(arg_count, 1, 0),
+        Function::Degrees => args_signature_scalars(arg_count, 1, 0),
+        Function::Int => args_signature_scalars(arg_count, 1, 0),
+        Function::Even => args_signature_scalars(arg_count, 1, 0),
+        Function::Odd => args_signature_scalars(arg_count, 1, 0),
+        Function::Ceiling => args_signature_scalars(arg_count, 2, 0),
+        Function::CeilingMath => args_signature_scalars(arg_count, 1, 2),
+        Function::CeilingPrecise => args_signature_scalars(arg_count, 1, 1),
+        Function::Floor => args_signature_scalars(arg_count, 2, 0),
+        Function::FloorMath => args_signature_scalars(arg_count, 1, 2),
+        Function::FloorPrecise => args_signature_scalars(arg_count, 1, 1),
+        Function::IsoCeiling => args_signature_scalars(arg_count, 1, 1),
+        Function::Mod => args_signature_scalars(arg_count, 2, 0),
+        Function::Quotient => args_signature_scalars(arg_count, 2, 0),
+        Function::Mround => args_signature_scalars(arg_count, 2, 0),
+        Function::Trunc => args_signature_scalars(arg_count, 1, 1),
+        Function::Gcd => vec![Signature::Vector; arg_count],
+        Function::Lcm => vec![Signature::Vector; arg_count],
+        Function::Base => args_signature_scalars(arg_count, 2, 1),
+        Function::Decimal => args_signature_scalars(arg_count, 2, 0),
+        Function::Roman => args_signature_scalars(arg_count, 1, 1),
+        Function::Arabic => args_signature_scalars(arg_count, 1, 0),
+        Function::Combin => args_signature_scalars(arg_count, 2, 0),
+        Function::Combina => args_signature_scalars(arg_count, 2, 0),
+        Function::Sumsq => vec![Signature::Vector; arg_count],
+
+        Function::N => args_signature_scalars(arg_count, 1, 0),
+        Function::Sheets => args_signature_scalars(arg_count, 0, 1),
+        Function::Cell => args_signature_scalars(arg_count, 1, 1),
+        Function::Info => args_signature_scalars(arg_count, 1, 1),
     }
 }
 
@@ -974,6 +1044,7 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Dollarfr => not_implemented(args),
         Function::Effect => not_implemented(args),
         Function::Fv => not_implemented(args),
+        Function::Fvschedule => not_implemented(args),
         Function::Ipmt => not_implemented(args),
         Function::Irr => not_implemented(args),
         Function::Ispmt => not_implemented(args),
@@ -981,9 +1052,20 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Nominal => not_implemented(args),
         Function::Nper => not_implemented(args),
         Function::Npv => not_implemented(args),
+        Function::Duration => not_implemented(args),
+        Function::Mduration => not_implemented(args),
         Function::Pduration => not_implemented(args),
+        Function::Accrint => not_implemented(args),
+        Function::Accrintm => not_implemented(args),
+        Function::Coupdaybs => not_implemented(args),
+        Function::Coupdays => not_implemented(args),
+        Function::Coupdaysnc => not_implemented(args),
+        Function::Coupncd => not_implemented(args),
+        Function::Coupnum => not_implemented(args),
+        Function::Couppcd => not_implemented(args),
         Function::Pmt => not_implemented(args),
         Function::Ppmt => not_implemented(args),
+        Function::Price => not_implemented(args),
         Function::Pv => not_implemented(args),
         Function::Rate => not_implemented(args),
         Function::Rri => not_implemented(args),
@@ -992,6 +1074,14 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Tbilleq => not_implemented(args),
         Function::Tbillprice => not_implemented(args),
         Function::Tbillyield => not_implemented(args),
+        Function::Yield => not_implemented(args),
+        Function::Pricedisc => not_implemented(args),
+        Function::Pricemat => not_implemented(args),
+        Function::Yielddisc => not_implemented(args),
+        Function::Yieldmat => not_implemented(args),
+        Function::Disc => not_implemented(args),
+        Function::Received => not_implemented(args),
+        Function::Intrate => not_implemented(args),
         Function::Xirr => not_implemented(args),
         Function::Xnpv => not_implemented(args),
         Function::Besseli => scalar_arguments(args),
@@ -1056,5 +1146,46 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Geomean => not_implemented(args),
         Function::Networkdays => not_implemented(args),
         Function::NetworkdaysIntl => not_implemented(args),
+        Function::Acot => scalar_arguments(args),
+        Function::Acoth => scalar_arguments(args),
+        Function::Cot => scalar_arguments(args),
+        Function::Coth => scalar_arguments(args),
+        Function::Csc => scalar_arguments(args),
+        Function::Csch => scalar_arguments(args),
+        Function::Sec => scalar_arguments(args),
+        Function::Sech => scalar_arguments(args),
+        Function::Exp => scalar_arguments(args),
+        Function::Fact => scalar_arguments(args),
+        Function::Factdouble => scalar_arguments(args),
+        Function::Sign => scalar_arguments(args),
+        Function::Radians => scalar_arguments(args),
+        Function::Degrees => scalar_arguments(args),
+        Function::Int => scalar_arguments(args),
+        Function::Even => scalar_arguments(args),
+        Function::Odd => scalar_arguments(args),
+        Function::Ceiling => scalar_arguments(args),
+        Function::CeilingMath => scalar_arguments(args),
+        Function::CeilingPrecise => scalar_arguments(args),
+        Function::Floor => scalar_arguments(args),
+        Function::FloorMath => scalar_arguments(args),
+        Function::FloorPrecise => scalar_arguments(args),
+        Function::IsoCeiling => scalar_arguments(args),
+        Function::Mod => scalar_arguments(args),
+        Function::Quotient => scalar_arguments(args),
+        Function::Mround => scalar_arguments(args),
+        Function::Trunc => scalar_arguments(args),
+        Function::Gcd => not_implemented(args),
+        Function::Lcm => not_implemented(args),
+        Function::Base => scalar_arguments(args),
+        Function::Decimal => scalar_arguments(args),
+        Function::Roman => scalar_arguments(args),
+        Function::Arabic => scalar_arguments(args),
+        Function::Combin => scalar_arguments(args),
+        Function::Combina => scalar_arguments(args),
+        Function::Sumsq => StaticResult::Scalar,
+        Function::N => scalar_arguments(args),
+        Function::Sheets => scalar_arguments(args),
+        Function::Cell => scalar_arguments(args),
+        Function::Info => scalar_arguments(args),
     }
 }

base/src/expressions/parser/stringify.rs

@@ -520,6 +520,7 @@ fn stringify(
             let x = match **left {
                 BooleanKind(_)
                 | NumberKind(_)
+                | UnaryKind { .. }
                 | StringKind(_)
                 | ReferenceKind { .. }
                 | RangeKind { .. }
@@ -535,7 +536,6 @@ fn stringify(
                 | FunctionKind { .. }
                 | InvalidFunctionKind { .. }
                 | ArrayKind(_)
-                | UnaryKind { .. }
                 | ErrorKind(_)
                 | ParseErrorKind { .. }
                 | OpSumKind { .. }
@@ -630,7 +630,6 @@ fn stringify(
                     | OpRangeKind { .. }
                     | OpConcatenateKind { .. }
                     | OpProductKind { .. }
-                    | OpPowerKind { .. }
                     | FunctionKind { .. }
                     | InvalidFunctionKind { .. }
                     | ArrayKind(_)
@@ -643,7 +642,7 @@ fn stringify(
                     | ParseErrorKind { .. }
                     | EmptyArgKind => false,
 
-                    OpSumKind { .. } | UnaryKind { .. } => true,
+                    OpPowerKind { .. } | OpSumKind { .. } | UnaryKind { .. } => true,
                 };
                 if needs_parentheses {
                     format!(

base/src/expressions/parser/tests/mod.rs

@@ -3,6 +3,7 @@ mod test_arrays;
 mod test_general;
 mod test_implicit_intersection;
 mod test_issue_155;
+mod test_issue_483;
 mod test_move_formula;
 mod test_ranges;
 mod test_stringify;

base/src/expressions/parser/tests/test_issue_483.rs

@@ -0,0 +1,27 @@
+#![allow(clippy::panic)]
+
+use std::collections::HashMap;
+
+use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::{Node, Parser};
+use crate::expressions::types::CellReferenceRC;
+
+#[test]
+fn issue_483_parser() {
+    let worksheets = vec!["Sheet1".to_string()];
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+
+    // Reference cell is Sheet1!A1
+    let cell_reference = CellReferenceRC {
+        sheet: "Sheet1".to_string(),
+        row: 2,
+        column: 2,
+    };
+    let t = parser.parse("-(A1^1.22)", &cell_reference);
+    assert!(matches!(t, Node::UnaryKind { .. }));
+    assert_eq!(to_string(&t, &cell_reference), "-(A1^1.22)");
+
+    let t = parser.parse("-A1^1.22", &cell_reference);
+    assert!(matches!(t, Node::OpPowerKind { .. }));
+    assert_eq!(to_string(&t, &cell_reference), "-A1^1.22");
+}

base/src/expressions/utils/mod.rs

@@ -259,15 +259,23 @@ pub fn is_valid_identifier(name: &str) -> bool {
 fn name_needs_quoting(name: &str) -> bool {
     let chars = name.chars();
     // it contains any of these characters: ()'$,;-+{} or space
-    for char in chars {
+    for (i, char) in chars.enumerate() {
         if [' ', '(', ')', '\'', '$', ',', ';', '-', '+', '{', '}'].contains(&char) {
             return true;
         }
+        // if it starts with a number
+        if i == 0 && char.is_ascii_digit() {
+            return true;
+        }
+    }
+    if parse_reference_a1(name).is_some() {
+        // cell reference in A1 notation, e.g. B1048576 is quoted, B1048577 is not
+        return true;
+    }
+    if parse_reference_r1c1(name).is_some() {
+        // cell reference in R1C1 notation, e.g. RC, RC2, R5C, R-4C, RC-8, R, C
+        return true;
     }
-    // TODO:
-    // cell reference in A1 notation, e.g. B1048576 is quoted, B1048577 is not
-    // cell reference in R1C1 notation, e.g. RC, RC2, R5C, R-4C, RC-8, R, C
-    // integers
     false
 }
 
@@ -279,3 +287,32 @@ pub fn quote_name(name: &str) -> String {
     };
     name.to_string()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_quote_name() {
+        assert_eq!(quote_name("Sheet1"), "Sheet1");
+        assert_eq!(quote_name("Sheet 1"), "'Sheet 1'");
+        // escape and quote
+        assert_eq!(quote_name("Sheet1'"), "'Sheet1'''");
+        assert_eq!(quote_name("Data(2024)"), "'Data(2024)'");
+        assert_eq!(quote_name("Data$2024"), "'Data$2024'");
+        assert_eq!(quote_name("Data-2024"), "'Data-2024'");
+        assert_eq!(quote_name("Data+2024"), "'Data+2024'");
+        assert_eq!(quote_name("Data,2024"), "'Data,2024'");
+        assert_eq!(quote_name("Data;2024"), "'Data;2024'");
+        assert_eq!(quote_name("Data{2024}"), "'Data{2024}'");
+
+        assert_eq!(quote_name("2024"), "'2024'");
+        assert_eq!(quote_name("1Data"), "'1Data'");
+        assert_eq!(quote_name("A1"), "'A1'");
+        assert_eq!(quote_name("R1C1"), "'R1C1'");
+        assert_eq!(quote_name("MySheet"), "MySheet");
+
+        assert_eq!(quote_name("B1048576"), "'B1048576'");
+        assert_eq!(quote_name("B1048577"), "B1048577");
+    }
+}

base/src/formatter/format.rs

@@ -154,16 +154,11 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
         ParsePart::Date(p) => {
             let tokens = &p.tokens;
             let mut text = "".to_string();
-            let date = match from_excel_date(value as i64) {
+            let time_fract = value.fract();
-                Ok(d) => d,
+            let hours = (time_fract * 24.0).floor();
-                Err(e) => {
+            let minutes = ((time_fract * 24.0 - hours) * 60.0).floor();
-                    return Formatted {
+            let seconds = ((((time_fract * 24.0 - hours) * 60.0) - minutes) * 60.0).round();
-                        text: "#VALUE!".to_owned(),
+            let date = from_excel_date(value as i64).ok();
-                        color: None,
-                        error: Some(e),
-                    }
-                }
-            };
             for token in tokens {
                 match token {
                     TextToken::Literal(c) => {
@@ -187,15 +182,44 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                     }
                     TextToken::Digit(_) => {}
                     TextToken::Period => {}
-                    TextToken::Day => {
+                    TextToken::Day => match date {
-                        let day = date.day() as usize;
+                        Some(date) => {
-                        text = format!("{text}{day}");
+                            let day = date.day() as usize;
-                    }
+                            text = format!("{text}{day}");
+                        }
+                        None => {
+                            return Formatted {
+                                text: "#VALUE!".to_owned(),
+                                color: None,
+                                error: Some(format!("Invalid date value: '{value}'")),
+                            }
+                        }
+                    },
                     TextToken::DayPadded => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let day = date.day() as usize;
                         text = format!("{text}{day:02}");
                     }
                     TextToken::DayNameShort => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let mut day = date.weekday().number_from_monday() as usize;
                         if day == 7 {
                             day = 0;
@@ -203,6 +227,16 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                         text = format!("{}{}", text, &locale.dates.day_names_short[day]);
                     }
                     TextToken::DayName => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let mut day = date.weekday().number_from_monday() as usize;
                         if day == 7 {
                             day = 0;
@@ -210,32 +244,144 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                         text = format!("{}{}", text, &locale.dates.day_names[day]);
                     }
                     TextToken::Month => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let month = date.month() as usize;
                         text = format!("{text}{month}");
                     }
                     TextToken::MonthPadded => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let month = date.month() as usize;
                         text = format!("{text}{month:02}");
                     }
                     TextToken::MonthNameShort => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let month = date.month() as usize;
                         text = format!("{}{}", text, &locale.dates.months_short[month - 1]);
                     }
                     TextToken::MonthName => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let month = date.month() as usize;
                         text = format!("{}{}", text, &locale.dates.months[month - 1]);
                     }
                     TextToken::MonthLetter => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         let month = date.month() as usize;
                         let months_letter = &locale.dates.months_letter[month - 1];
                         text = format!("{text}{months_letter}");
                     }
                     TextToken::YearShort => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         text = format!("{}{}", text, date.format("%y"));
                     }
                     TextToken::Year => {
+                        let date = match date {
+                            Some(d) => d,
+                            None => {
+                                return Formatted {
+                                    text: "#VALUE!".to_owned(),
+                                    color: None,
+                                    error: Some(format!("Invalid date value: '{value}'")),
+                                }
+                            }
+                        };
                         text = format!("{}{}", text, date.year());
                     }
+                    TextToken::Hour => {
+                        let mut hour = hours as i32;
+                        if p.use_ampm {
+                            if hour == 0 {
+                                hour = 12;
+                            } else if hour > 12 {
+                                hour -= 12;
+                            }
+                        }
+                        text = format!("{text}{hour}");
+                    }
+                    TextToken::HourPadded => {
+                        let mut hour = hours as i32;
+                        if p.use_ampm {
+                            if hour == 0 {
+                                hour = 12;
+                            } else if hour > 12 {
+                                hour -= 12;
+                            }
+                        }
+                        text = format!("{text}{hour:02}");
+                    }
+                    TextToken::Second => {
+                        let second = seconds as i32;
+                        text = format!("{text}{second}");
+                    }
+                    TextToken::SecondPadded => {
+                        let second = seconds as i32;
+                        text = format!("{text}{second:02}");
+                    }
+                    TextToken::AMPM => {
+                        let ampm = if hours < 12.0 { "AM" } else { "PM" };
+                        text = format!("{text}{ampm}");
+                    }
+                    TextToken::Minute => {
+                        let minute = minutes as i32;
+                        text = format!("{text}{minute}");
+                    }
+                    TextToken::MinutePadded => {
+                        let minute = minutes as i32;
+                        text = format!("{text}{minute:02}");
+                    }
                 }
             }
             Formatted {
@@ -422,6 +568,13 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                     TextToken::MonthLetter => {}
                     TextToken::YearShort => {}
                     TextToken::Year => {}
+                    TextToken::Hour => {}
+                    TextToken::HourPadded => {}
+                    TextToken::Minute => {}
+                    TextToken::MinutePadded => {}
+                    TextToken::Second => {}
+                    TextToken::SecondPadded => {}
+                    TextToken::AMPM => {}
                 }
             }
             Formatted {

base/src/formatter/lexer.rs

@@ -26,19 +26,23 @@ pub enum Token {
     Scientific,    // E+
     ScientificMinus, // E-
     General,       // General
-    // Dates
+    // Dates and time
     Day,            // d
     DayPadded,      // dd
     DayNameShort,   // ddd
     DayName,        // dddd+
-    Month,          // m
+    Month,          // m (or minute)
-    MonthPadded,    // mm
+    MonthPadded,    // mm (or minute padded)
     MonthNameShort, // mmm
     MonthName,      // mmmm or mmmmmm+
     MonthLetter,    // mmmmm
     YearShort,      // y or yy
     Year,           // yyy+
-    // TODO: Hours Minutes and Seconds
+    Hour,           // h
+    HourPadded,     // hh
+    Second,         // s
+    SecondPadded,   // ss
+    AMPM,           // AM/PM (or A/P)
     ILLEGAL,
     EOF,
 }
@@ -361,8 +365,8 @@ impl Lexer {
                         self.read_next_char();
                     }
                     match m {
-                        1 => Token::Month,
+                        1 => Token::Month,       // (or minute)
-                        2 => Token::MonthPadded,
+                        2 => Token::MonthPadded, // (or minute padded)
                         3 => Token::MonthNameShort,
                         4 => Token::MonthName,
                         5 => Token::MonthLetter,
@@ -381,6 +385,63 @@ impl Lexer {
                         Token::Year
                     }
                 }
+                'h' => {
+                    let mut h = 1;
+                    while let Some('h') = self.peek_char() {
+                        h += 1;
+                        self.read_next_char();
+                    }
+                    if h == 1 {
+                        Token::Hour
+                    } else if h == 2 {
+                        Token::HourPadded
+                    } else {
+                        self.set_error("Unexpected character after 'h'");
+                        Token::ILLEGAL
+                    }
+                }
+                's' => {
+                    let mut s = 1;
+                    while let Some('s') = self.peek_char() {
+                        s += 1;
+                        self.read_next_char();
+                    }
+                    if s == 1 {
+                        Token::Second
+                    } else if s == 2 {
+                        Token::SecondPadded
+                    } else {
+                        self.set_error("Unexpected character after 's'");
+                        Token::ILLEGAL
+                    }
+                }
+                'A' | 'a' => {
+                    if let Some('M') | Some('m') = self.peek_char() {
+                        self.read_next_char();
+                    } else {
+                        self.set_error("Unexpected character after 'A'");
+                        return Token::ILLEGAL;
+                    }
+                    if let Some('/') = self.peek_char() {
+                        self.read_next_char();
+                    } else {
+                        self.set_error("Unexpected character after 'AM'");
+                        return Token::ILLEGAL;
+                    }
+                    if let Some('P') | Some('p') = self.peek_char() {
+                        self.read_next_char();
+                    } else {
+                        self.set_error("Unexpected character after 'AM'");
+                        return Token::ILLEGAL;
+                    }
+                    if let Some('M') | Some('m') = self.peek_char() {
+                        self.read_next_char();
+                    } else {
+                        self.set_error("Unexpected character after 'AMP'");
+                        return Token::ILLEGAL;
+                    }
+                    Token::AMPM
+                }
                 'g' | 'G' => {
                     for c in "eneral".chars() {
                         let cc = self.read_next_char();

base/src/formatter/parser.rs

@@ -27,6 +27,13 @@ pub enum TextToken {
     MonthLetter,
     YearShort,
     Year,
+    Hour,
+    HourPadded,
+    Minute,
+    MinutePadded,
+    Second,
+    SecondPadded,
+    AMPM,
 }
 pub struct NumberPart {
     pub color: Option<i32>,
@@ -45,6 +52,7 @@ pub struct NumberPart {
 
 pub struct DatePart {
     pub color: Option<i32>,
+    pub use_ampm: bool,
     pub tokens: Vec<TextToken>,
 }
 
@@ -101,6 +109,7 @@ impl Parser {
         let mut digit_count = 0;
         let mut precision = 0;
         let mut is_date = false;
+        let mut use_ampm = false;
         let mut is_number = false;
         let mut found_decimal_dot = false;
         let mut use_thousands = false;
@@ -116,6 +125,7 @@ impl Parser {
         let mut number = 'i';
         let mut index = 0;
         let mut currency = None;
+        let mut is_time = false;
 
         while token != Token::EOF && token != Token::Separator {
             let next_token = self.lexer.next_token();
@@ -200,6 +210,9 @@ impl Parser {
                     index += 1;
                 }
                 Token::Literal(value) => {
+                    if value == ':' {
+                        is_time = true;
+                    }
                     tokens.push(TextToken::Literal(value));
                 }
                 Token::Text(value) => {
@@ -236,12 +249,22 @@ impl Parser {
                     tokens.push(TextToken::MonthName);
                 }
                 Token::Month => {
-                    is_date = true;
+                    if is_time {
-                    tokens.push(TextToken::Month);
+                        // minute
+                        tokens.push(TextToken::Minute);
+                    } else {
+                        is_date = true;
+                        tokens.push(TextToken::Month);
+                    }
                 }
                 Token::MonthPadded => {
-                    is_date = true;
+                    if is_time {
-                    tokens.push(TextToken::MonthPadded);
+                        // minute padded
+                        tokens.push(TextToken::MinutePadded);
+                    } else {
+                        is_date = true;
+                        tokens.push(TextToken::MonthPadded);
+                    }
                 }
                 Token::MonthLetter => {
                     is_date = true;
@@ -255,6 +278,32 @@ impl Parser {
                     is_date = true;
                     tokens.push(TextToken::Year);
                 }
+                Token::Hour => {
+                    is_date = true;
+                    is_time = true;
+                    tokens.push(TextToken::Hour);
+                }
+                Token::HourPadded => {
+                    is_date = true;
+                    is_time = true;
+                    tokens.push(TextToken::HourPadded);
+                }
+                Token::Second => {
+                    is_date = true;
+                    is_time = true;
+                    tokens.push(TextToken::Second);
+                }
+                Token::SecondPadded => {
+                    is_date = true;
+                    is_time = true;
+                    tokens.push(TextToken::SecondPadded);
+                }
+
+                Token::AMPM => {
+                    is_date = true;
+                    use_ampm = true;
+                    tokens.push(TextToken::AMPM);
+                }
                 Token::Scientific => {
                     if !is_scientific {
                         index = 0;
@@ -282,7 +331,11 @@ impl Parser {
             if is_number {
                 return ParsePart::Error(ErrorPart {});
             }
-            ParsePart::Date(DatePart { color, tokens })
+            ParsePart::Date(DatePart {
+                color,
+                use_ampm,
+                tokens,
+            })
         } else {
             ParsePart::Number(NumberPart {
                 color,

base/src/formatter/test/mod.rs

@@ -1,2 +1,3 @@
 mod test_general;
 mod test_parse_formatted_number;
+mod test_time;

base/src/formatter/test/test_time.rs

@@ -0,0 +1,32 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{
+    formatter::format::format_number,
+    locale::{get_locale, Locale},
+};
+
+fn get_default_locale() -> &'static Locale {
+    get_locale("en").unwrap()
+}
+
+#[test]
+fn simple_test() {
+    let locale = get_default_locale();
+    let format = "h:mm AM/PM";
+    let value = 16.001_423_611_111_11; // =1/86400 => 12:02 AM
+    let formatted = format_number(value, format, locale);
+    assert_eq!(formatted.text, "12:02 AM");
+}
+
+#[test]
+fn padded_vs_unpadded() {
+    let locale = get_default_locale();
+    let padded_format = "hh:mm:ss AM/PM";
+    let unpadded_format = "h:m:s AM/PM";
+    let value = 0.25351851851851853; // => 6:05:04 AM (21904/(24*60*60)) where 21904 = 6 * 3600 + 5*60 + 4
+    let formatted = format_number(value, padded_format, locale);
+    assert_eq!(formatted.text, "06:05:04 AM");
+
+    let formatted = format_number(value, unpadded_format, locale);
+    assert_eq!(formatted.text, "6:5:4 AM");
+}

base/src/functions/information.rs

@@ -1,6 +1,6 @@
 use crate::{
     calc_result::CalcResult,
-    expressions::{parser::Node, token::Error, types::CellReferenceIndex},
+    expressions::{parser::Node, token::Error, types::CellReferenceIndex, utils::number_to_column},
     model::{Model, ParsedDefinedName},
 };
 
@@ -320,4 +320,150 @@ impl Model {
             message: "Invalid name".to_string(),
         }
     }
+
+    pub(crate) fn fn_n(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let arg_count = args.len();
+        if arg_count != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.evaluate_node_in_context(&args[0], cell) {
+            CalcResult::Number(n) => n,
+            CalcResult::String(_) => 0.0,
+            CalcResult::Boolean(f) => {
+                if f {
+                    1.0
+                } else {
+                    0.0
+                }
+            }
+            CalcResult::EmptyCell | CalcResult::EmptyArg => 0.0,
+            error @ CalcResult::Error { .. } => return error,
+            CalcResult::Range { .. } => {
+                return CalcResult::Error {
+                    error: Error::NIMPL,
+                    origin: cell,
+                    message: "Arrays not supported yet".to_string(),
+                }
+            }
+            CalcResult::Array(_) => {
+                return CalcResult::Error {
+                    error: Error::NIMPL,
+                    origin: cell,
+                    message: "Arrays not supported yet".to_string(),
+                }
+            }
+        };
+
+        CalcResult::Number(value)
+    }
+
+    pub(crate) fn fn_sheets(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let arg_count = args.len();
+        if arg_count > 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        if arg_count == 1 {
+            return CalcResult::Error {
+                error: Error::NIMPL,
+                origin: cell,
+                message: "Sheets function with an argument is not implemented".to_string(),
+            };
+        }
+        let sheet_count = self.workbook.worksheets.len() as f64;
+        CalcResult::Number(sheet_count)
+    }
+
+    pub(crate) fn fn_cell(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let arg_count = args.len();
+        if arg_count == 0 || arg_count > 2 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let reference = if arg_count == 2 {
+            match self.evaluate_node_with_reference(&args[1], cell) {
+                CalcResult::Range { left, right: _ } => {
+                    // we just take the left cell of the range
+                    left
+                }
+                _ => {
+                    return CalcResult::Error {
+                        error: Error::VALUE,
+                        origin: cell,
+                        message: "Argument must be a reference".to_string(),
+                    }
+                }
+            }
+        } else {
+            CellReferenceIndex {
+                sheet: cell.sheet,
+                row: cell.row,
+                column: cell.column,
+            }
+        };
+        let info_type = match self.get_string(&args[0], cell) {
+            Ok(s) => s.to_uppercase(),
+            Err(e) => return e,
+        };
+        match info_type.as_str() {
+            "ADDRESS" => {
+                if reference.sheet != cell.sheet {
+                    return CalcResult::Error {
+                        error: Error::NIMPL,
+                        origin: cell,
+                        message: "References to other sheets not implemented".to_string(),
+                    };
+                }
+                let column = match number_to_column(reference.column) {
+                    Some(c) => c,
+                    None => {
+                        return CalcResult::Error {
+                            error: Error::VALUE,
+                            origin: cell,
+                            message: "Invalid column".to_string(),
+                        }
+                    }
+                };
+                let address = format!("${}${}", column, reference.row);
+                CalcResult::String(address)
+            }
+            "COL" => CalcResult::Number(reference.column as f64),
+            "COLOR" | "FILENAME" | "FORMAT" | "PARENTHESES" | "PREFIX" | "PROTECT" | "WIDTH" => {
+                CalcResult::Error {
+                    error: Error::VALUE,
+                    origin: cell,
+                    message: "info_type not implemented".to_string(),
+                }
+            }
+            "CONTENTS" => self.evaluate_cell(reference),
+            "ROW" => CalcResult::Number(reference.row as f64),
+            "TYPE" => {
+                let cell_type = match self.evaluate_cell(reference) {
+                    CalcResult::EmptyCell => "b",
+                    CalcResult::String(_) => "l",
+                    CalcResult::Number(_) => "v",
+                    CalcResult::Boolean(_) => "v",
+                    CalcResult::Error { .. } => "v",
+                    CalcResult::Range { .. } => "v",
+                    CalcResult::EmptyArg => "v",
+                    CalcResult::Array(_) => "v",
+                };
+                CalcResult::String(cell_type.to_string())
+            }
+            _ => CalcResult::Error {
+                error: Error::VALUE,
+                origin: cell,
+                message: "Invalid info_type".to_string(),
+            },
+        }
+    }
+
+    pub(crate) fn fn_info(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() || args.len() > 2 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        CalcResult::Error {
+            error: Error::NIMPL,
+            origin: cell,
+            message: "Info function not implemented".to_string(),
+        }
+    }
 }

base/src/functions/math_util.rs

@@ -0,0 +1,200 @@
+/// Parse Roman (classic or Excel variants) → number
+pub fn from_roman(s: &str) -> Result<u32, String> {
+    if s.is_empty() {
+        return Err("empty numeral".into());
+    }
+    fn val(c: char) -> Option<u32> {
+        Some(match c {
+            'I' => 1,
+            'V' => 5,
+            'X' => 10,
+            'L' => 50,
+            'C' => 100,
+            'D' => 500,
+            'M' => 1000,
+            _ => return None,
+        })
+    }
+
+    // Accept the union of subtractive pairs used by the tables above (Excel-compatible).
+    fn allowed_subtractive(a: char, b: char) -> bool {
+        matches!(
+            (a, b),
+            // classic:
+            ('I','V')|('I','X')|('X','L')|('X','C')|('C','D')|('C','M')
+            // Excel forms:
+            |('V','L')|('L','D')|('L','M') // VL, LD, LM
+            |('X','D')|('X','M')          // XD, XM
+            |('V','M')                    // VM
+            |('I','L')|('I','C')|('I','D')|('I','M') // IL, IC, ID, IM
+            |('V','D')|('V','C') // VD, VC
+        )
+    }
+
+    let chars: Vec<char> = s.chars().map(|c| c.to_ascii_uppercase()).collect();
+    let mut total = 0u32;
+    let mut i = 0usize;
+
+    // Repetition rules similar to classic Romans:
+    // V, L, D cannot repeat; I, X, C, M max 3 in a row.
+    let mut last_char: Option<char> = None;
+    let mut run_len = 0usize;
+
+    while i < chars.len() {
+        let c = chars[i];
+        let v = val(c).ok_or_else(|| format!("invalid character '{c}'"))?;
+
+        if Some(c) == last_char {
+            run_len += 1;
+            match c {
+                'V' | 'L' | 'D' => return Err(format!("invalid repetition of '{c}'")),
+                _ if run_len >= 3 => return Err(format!("invalid repetition of '{c}'")),
+                _ => {}
+            }
+        } else {
+            last_char = Some(c);
+            run_len = 0;
+        }
+
+        if i + 1 < chars.len() {
+            let c2 = chars[i + 1];
+            let v2 = val(c2).ok_or_else(|| format!("invalid character '{c2}'"))?;
+            if v < v2 {
+                if !allowed_subtractive(c, c2) {
+                    return Err(format!("invalid subtractive pair '{c}{c2}'"));
+                }
+                // Disallow stacked subtractives like IIV, XXL:
+                if run_len > 0 {
+                    return Err(format!("malformed numeral near position {i}"));
+                }
+                total += v2 - v;
+                i += 2;
+                last_char = None;
+                run_len = 0;
+                continue;
+            }
+        }
+
+        total += v;
+        i += 1;
+    }
+    Ok(total)
+}
+
+/// Classic Roman (strict) encoder used as a base for all forms.
+fn to_roman(mut n: u32) -> Result<String, String> {
+    if !(1..=3999).contains(&n) {
+        return Err("value out of range (must be 1..=3999)".into());
+    }
+
+    const MAP: &[(u32, &str)] = &[
+        (1000, "M"),
+        (900, "CM"),
+        (500, "D"),
+        (400, "CD"),
+        (100, "C"),
+        (90, "XC"),
+        (50, "L"),
+        (40, "XL"),
+        (10, "X"),
+        (9, "IX"),
+        (5, "V"),
+        (4, "IV"),
+        (1, "I"),
+    ];
+
+    let mut out = String::with_capacity(15);
+    for &(val, sym) in MAP {
+        while n >= val {
+            out.push_str(sym);
+            n -= val;
+        }
+        if n == 0 {
+            break;
+        }
+    }
+    Ok(out)
+}
+
+/// Excel/Google Sheets compatible ROMAN(number, [form]) encoder.
+/// `form`: 0..=4 (0=Classic, 4=Simplified).
+pub fn to_roman_with_form(n: u32, form: i32) -> Result<String, String> {
+    let mut s = to_roman(n)?;
+    if form == 0 {
+        return Ok(s);
+    }
+    if !(0..=4).contains(&form) {
+        return Err("form must be between 0 and 4".into());
+    }
+
+    // Base rules (apply for all f >= 1)
+    let base_rules: &[(&str, &str)] = &[
+        // C(D|M)XC -> L$1XL
+        ("CDXC", "LDXL"),
+        ("CMXC", "LMXL"),
+        // C(D|M)L -> L$1
+        ("CDL", "LD"),
+        ("CML", "LM"),
+        // X(L|C)IX -> V$1IV
+        ("XLIX", "VLIV"),
+        ("XCIX", "VCIV"),
+        // X(L|C)V -> V$1
+        ("XLV", "VL"),
+        ("XCV", "VC"),
+    ];
+
+    // Level 2 extra rules
+    let lvl2_rules: &[(&str, &str)] = &[
+        // V(L|C)IV -> I$1
+        ("VLIV", "IL"),
+        ("VCIV", "IC"),
+        // L(D|M)XL -> X$1
+        ("LDXL", "XD"),
+        ("LMXL", "XM"),
+        // L(D|M)VL -> X$1V
+        ("LDVL", "XDV"),
+        ("LMVL", "XMV"),
+        // L(D|M)IL -> X$1IX
+        ("LDIL", "XDIX"),
+        ("LMIL", "XMIX"),
+    ];
+
+    // Level 3 extra rules
+    let lvl3_rules: &[(&str, &str)] = &[
+        // X(D|M)V -> V$1
+        ("XDV", "VD"),
+        ("XMV", "VM"),
+        // X(D|M)IX -> V$1IV
+        ("XDIX", "VDIV"),
+        ("XMIX", "VMIV"),
+    ];
+
+    // Level 4 extra rules
+    let lvl4_rules: &[(&str, &str)] = &[
+        // V(D|M)IV -> I$1
+        ("VDIV", "ID"),
+        ("VMIV", "IM"),
+    ];
+
+    // Helper to apply a batch of (from -> to) globally, in order.
+    fn apply_rules(mut t: String, rules: &[(&str, &str)]) -> String {
+        for (from, to) in rules {
+            if t.contains(from) {
+                t = t.replace(from, to);
+            }
+        }
+        t
+    }
+
+    s = apply_rules(s, base_rules);
+    if form >= 2 {
+        s = apply_rules(s, lvl2_rules);
+    }
+    if form >= 3 {
+        s = apply_rules(s, lvl3_rules);
+    }
+    if form >= 4 {
+        s = apply_rules(s, lvl4_rules);
+    }
+    Ok(s)
+}

base/src/functions/mod.rs

@@ -16,6 +16,7 @@ mod information;
 mod logical;
 mod lookup_and_reference;
 mod macros;
+mod math_util;
 mod mathematical;
 mod statistical;
 mod subtotal;
@@ -76,6 +77,43 @@ pub enum Function {
     Sumifs,
     Tan,
     Tanh,
+    Acot,
+    Acoth,
+    Cot,
+    Coth,
+    Csc,
+    Csch,
+    Sec,
+    Sech,
+    Exp,
+    Fact,
+    Factdouble,
+    Sign,
+    Radians,
+    Degrees,
+    Int,
+    Even,
+    Odd,
+    Ceiling,
+    CeilingMath,
+    CeilingPrecise,
+    Floor,
+    FloorMath,
+    FloorPrecise,
+    IsoCeiling,
+    Mod,
+    Quotient,
+    Mround,
+    Trunc,
+    Gcd,
+    Lcm,
+    Base,
+    Decimal,
+    Roman,
+    Arabic,
+    Combin,
+    Combina,
+    Sumsq,
 
     // Information
     ErrorType,
@@ -96,6 +134,11 @@ pub enum Function {
     Sheet,
     Type,
 
+    Sheets,
+    N,
+    Cell,
+    Info,
+
     // Lookup and reference
     Hlookup,
     Index,
@@ -174,6 +217,14 @@ pub enum Function {
     Isoweeknum,
 
     // Financial
+    Accrint,
+    Accrintm,
+    Coupdaybs,
+    Coupdays,
+    Coupdaysnc,
+    Coupncd,
+    Coupnum,
+    Couppcd,
     Cumipmt,
     Cumprinc,
     Db,
@@ -182,6 +233,7 @@ pub enum Function {
     Dollarfr,
     Effect,
     Fv,
+    Fvschedule,
     Ipmt,
     Irr,
     Ispmt,
@@ -189,9 +241,12 @@ pub enum Function {
     Nominal,
     Nper,
     Npv,
+    Duration,
+    Mduration,
     Pduration,
     Pmt,
     Ppmt,
+    Price,
     Pv,
     Rate,
     Rri,
@@ -200,8 +255,16 @@ pub enum Function {
     Tbilleq,
     Tbillprice,
     Tbillyield,
+    Pricedisc,
+    Pricemat,
+    Yielddisc,
+    Yieldmat,
+    Disc,
+    Received,
+    Intrate,
     Xirr,
     Xnpv,
+    Yield,
 
     // Engineering: Bessel and transcendental functions
     Besseli,
@@ -270,7 +333,7 @@ pub enum Function {
 }
 
 impl Function {
-    pub fn into_iter() -> IntoIter<Function, 215> {
+    pub fn into_iter() -> IntoIter<Function, 276> {
         [
             Function::And,
             Function::False,
@@ -303,12 +366,44 @@ impl Function {
             Function::Sqrt,
             Function::Sqrtpi,
             Function::Atan2,
+            Function::Acot,
+            Function::Acoth,
+            Function::Cot,
+            Function::Coth,
+            Function::Csc,
+            Function::Csch,
+            Function::Sec,
+            Function::Sech,
             Function::Power,
+            Function::Exp,
+            Function::Fact,
+            Function::Factdouble,
+            Function::Sign,
+            Function::Int,
+            Function::Even,
+            Function::Odd,
+            Function::Ceiling,
+            Function::CeilingMath,
+            Function::CeilingPrecise,
+            Function::Floor,
+            Function::FloorMath,
+            Function::FloorPrecise,
+            Function::IsoCeiling,
+            Function::Mod,
+            Function::Quotient,
+            Function::Mround,
+            Function::Trunc,
+            Function::Gcd,
+            Function::Lcm,
+            Function::Base,
+            Function::Decimal,
             Function::Max,
             Function::Min,
             Function::Product,
             Function::Rand,
             Function::Randbetween,
+            Function::Radians,
+            Function::Degrees,
             Function::Round,
             Function::Rounddown,
             Function::Roundup,
@@ -399,18 +494,23 @@ impl Function {
             Function::WorkdayIntl,
             Function::Yearfrac,
             Function::Isoweeknum,
+            Function::Accrint,
+            Function::Accrintm,
             Function::Pmt,
             Function::Pv,
             Function::Rate,
             Function::Nper,
             Function::Fv,
+            Function::Fvschedule,
             Function::Ppmt,
+            Function::Price,
             Function::Ipmt,
             Function::Npv,
             Function::Mirr,
             Function::Irr,
             Function::Xirr,
             Function::Xnpv,
+            Function::Yield,
             Function::Rept,
             Function::Textafter,
             Function::Textbefore,
@@ -422,10 +522,25 @@ impl Function {
             Function::Syd,
             Function::Nominal,
             Function::Effect,
+            Function::Duration,
+            Function::Mduration,
             Function::Pduration,
+            Function::Coupdaybs,
+            Function::Coupdays,
+            Function::Coupdaysnc,
+            Function::Coupncd,
+            Function::Coupnum,
+            Function::Couppcd,
             Function::Tbillyield,
             Function::Tbillprice,
             Function::Tbilleq,
+            Function::Pricedisc,
+            Function::Pricemat,
+            Function::Yielddisc,
+            Function::Yieldmat,
+            Function::Disc,
+            Function::Received,
+            Function::Intrate,
             Function::Dollarde,
             Function::Dollarfr,
             Function::Ddb,
@@ -487,6 +602,15 @@ impl Function {
             Function::Delta,
             Function::Gestep,
             Function::Subtotal,
+            Function::Roman,
+            Function::Arabic,
+            Function::Combin,
+            Function::Combina,
+            Function::Sumsq,
+            Function::N,
+            Function::Cell,
+            Function::Info,
+            Function::Sheets,
         ]
         .into_iter()
     }
@@ -529,6 +653,18 @@ impl Function {
             Function::Sheet => "_xlfn.SHEET".to_string(),
             Function::Formulatext => "_xlfn.FORMULATEXT".to_string(),
             Function::Isoweeknum => "_xlfn.ISOWEEKNUM".to_string(),
+            Function::Ceiling => "_xlfn.CEILING".to_string(),
+            Function::CeilingMath => "_xlfn.CEILING.MATH".to_string(),
+            Function::CeilingPrecise => "_xlfn.CEILING.PRECISE".to_string(),
+            Function::FloorMath => "_xlfn.FLOOR.MATH".to_string(),
+            Function::FloorPrecise => "_xlfn.FLOOR.PRECISE".to_string(),
+            Function::IsoCeiling => "_xlfn.ISO.CEILING".to_string(),
+            Function::Base => "_xlfn.BASE".to_string(),
+            Function::Decimal => "_xlfn.DECIMAL".to_string(),
+            Function::Arabic => "_xlfn.ARABIC".to_string(),
+            Function::Combina => "_xlfn.COMBINA".to_string(),
+            Function::Sheets => "_xlfn.SHEETS".to_string(),
+
             _ => self.to_string(),
         }
     }
@@ -551,34 +687,61 @@ impl Function {
             "SWITCH" | "_XLFN.SWITCH" => Some(Function::Switch),
             "TRUE" => Some(Function::True),
             "XOR" | "_XLFN.XOR" => Some(Function::Xor),
-
             "SIN" => Some(Function::Sin),
             "COS" => Some(Function::Cos),
             "TAN" => Some(Function::Tan),
-
             "ASIN" => Some(Function::Asin),
             "ACOS" => Some(Function::Acos),
             "ATAN" => Some(Function::Atan),
-
             "SINH" => Some(Function::Sinh),
             "COSH" => Some(Function::Cosh),
             "TANH" => Some(Function::Tanh),
-
             "ASINH" => Some(Function::Asinh),
             "ACOSH" => Some(Function::Acosh),
             "ATANH" => Some(Function::Atanh),
-
+            "ACOT" => Some(Function::Acot),
+            "COTH" => Some(Function::Coth),
+            "COT" => Some(Function::Cot),
+            "CSC" => Some(Function::Csc),
+            "CSCH" => Some(Function::Csch),
+            "SEC" => Some(Function::Sec),
+            "SECH" => Some(Function::Sech),
+            "ACOTH" => Some(Function::Acoth),
+            "FACT" => Some(Function::Fact),
+            "FACTDOUBLE" => Some(Function::Factdouble),
+            "EXP" => Some(Function::Exp),
+            "SIGN" => Some(Function::Sign),
+            "RADIANS" => Some(Function::Radians),
+            "DEGREES" => Some(Function::Degrees),
+            "INT" => Some(Function::Int),
+            "EVEN" => Some(Function::Even),
+            "ODD" => Some(Function::Odd),
+            "CEILING" | "_XLFN.CEILING" => Some(Function::Ceiling),
+            "CEILING.MATH" | "_XLFN.CEILING.MATH" => Some(Function::CeilingMath),
+            "CEILING.PRECISE" | "_XLFN.CEILING.PRECISE" => Some(Function::CeilingPrecise),
+            "FLOOR" => Some(Function::Floor),
+            "FLOOR.MATH" | "_XLFN.FLOOR.MATH" => Some(Function::FloorMath),
+            "FLOOR.PRECISE" | "_XLFN.FLOOR.PRECISE" => Some(Function::FloorPrecise),
+            "ISO.CEILING" | "_XLFN.ISO.CEILING" => Some(Function::IsoCeiling),
+            "MOD" => Some(Function::Mod),
+            "QUOTIENT" => Some(Function::Quotient),
+            "MROUND" => Some(Function::Mround),
+            "TRUNC" => Some(Function::Trunc),
+            "GCD" => Some(Function::Gcd),
+            "LCM" => Some(Function::Lcm),
+            "BASE" | "_XLFN.BASE" => Some(Function::Base),
+            "DECIMAL" | "_XLFN.DECIMAL" => Some(Function::Decimal),
+            "ROMAN" => Some(Function::Roman),
+            "ARABIC" | "_XLFN.ARABIC" => Some(Function::Arabic),
             "PI" => Some(Function::Pi),
             "ABS" => Some(Function::Abs),
             "SQRT" => Some(Function::Sqrt),
             "SQRTPI" => Some(Function::Sqrtpi),
             "POWER" => Some(Function::Power),
             "ATAN2" => Some(Function::Atan2),
-
             "LN" => Some(Function::Ln),
             "LOG" => Some(Function::Log),
             "LOG10" => Some(Function::Log10),
-
             "MAX" => Some(Function::Max),
             "MIN" => Some(Function::Min),
             "PRODUCT" => Some(Function::Product),
@@ -590,6 +753,9 @@ impl Function {
             "SUM" => Some(Function::Sum),
             "SUMIF" => Some(Function::Sumif),
             "SUMIFS" => Some(Function::Sumifs),
+            "COMBIN" => Some(Function::Combin),
+            "COMBINA" | "_XLFN.COMBINA" => Some(Function::Combina),
+            "SUMSQ" => Some(Function::Sumsq),
 
             // Lookup and Reference
             "CHOOSE" => Some(Function::Choose),
@@ -687,15 +853,20 @@ impl Function {
             "YEARFRAC" => Some(Function::Yearfrac),
             "ISOWEEKNUM" | "_XLFN.ISOWEEKNUM" => Some(Function::Isoweeknum),
             // Financial
+            "ACCRINT" => Some(Function::Accrint),
+            "ACCRINTM" => Some(Function::Accrintm),
             "PMT" => Some(Function::Pmt),
             "PV" => Some(Function::Pv),
             "RATE" => Some(Function::Rate),
             "NPER" => Some(Function::Nper),
             "FV" => Some(Function::Fv),
+            "FVSCHEDULE" => Some(Function::Fvschedule),
             "PPMT" => Some(Function::Ppmt),
+            "PRICE" => Some(Function::Price),
             "IPMT" => Some(Function::Ipmt),
             "NPV" => Some(Function::Npv),
             "XNPV" => Some(Function::Xnpv),
+            "YIELD" => Some(Function::Yield),
             "MIRR" => Some(Function::Mirr),
             "IRR" => Some(Function::Irr),
             "XIRR" => Some(Function::Xirr),
@@ -706,11 +877,27 @@ impl Function {
             "SYD" => Some(Function::Syd),
             "NOMINAL" => Some(Function::Nominal),
             "EFFECT" => Some(Function::Effect),
+            "DURATION" => Some(Function::Duration),
+            "MDURATION" => Some(Function::Mduration),
             "PDURATION" | "_XLFN.PDURATION" => Some(Function::Pduration),
 
+            "COUPDAYBS" => Some(Function::Coupdaybs),
+            "COUPDAYS" => Some(Function::Coupdays),
+            "COUPDAYSNC" => Some(Function::Coupdaysnc),
+            "COUPNCD" => Some(Function::Coupncd),
+            "COUPNUM" => Some(Function::Coupnum),
+            "COUPPCD" => Some(Function::Couppcd),
+
             "TBILLYIELD" => Some(Function::Tbillyield),
             "TBILLPRICE" => Some(Function::Tbillprice),
             "TBILLEQ" => Some(Function::Tbilleq),
+            "PRICEDISC" => Some(Function::Pricedisc),
+            "PRICEMAT" => Some(Function::Pricemat),
+            "YIELDDISC" => Some(Function::Yielddisc),
+            "YIELDMAT" => Some(Function::Yieldmat),
+            "DISC" => Some(Function::Disc),
+            "RECEIVED" => Some(Function::Received),
+            "INTRATE" => Some(Function::Intrate),
 
             "DOLLARDE" => Some(Function::Dollarde),
             "DOLLARFR" => Some(Function::Dollarfr),
@@ -777,6 +964,12 @@ impl Function {
             "GESTEP" => Some(Function::Gestep),
 
             "SUBTOTAL" => Some(Function::Subtotal),
+
+            "N" => Some(Function::N),
+            "CELL" => Some(Function::Cell),
+            "INFO" => Some(Function::Info),
+            "SHEETS" | "_XLFN.SHEETS" => Some(Function::Sheets),
+
             _ => None,
         }
     }
@@ -811,6 +1004,14 @@ impl fmt::Display for Function {
             Function::Asinh => write!(f, "ASINH"),
             Function::Acosh => write!(f, "ACOSH"),
             Function::Atanh => write!(f, "ATANH"),
+            Function::Acot => write!(f, "ACOT"),
+            Function::Acoth => write!(f, "ACOTH"),
+            Function::Cot => write!(f, "COT"),
+            Function::Coth => write!(f, "COTH"),
+            Function::Csc => write!(f, "CSC"),
+            Function::Csch => write!(f, "CSCH"),
+            Function::Sec => write!(f, "SEC"),
+            Function::Sech => write!(f, "SECH"),
             Function::Abs => write!(f, "ABS"),
             Function::Pi => write!(f, "PI"),
             Function::Sqrt => write!(f, "SQRT"),
@@ -875,7 +1076,6 @@ impl fmt::Display for Function {
             Function::Isformula => write!(f, "ISFORMULA"),
             Function::Type => write!(f, "TYPE"),
             Function::Sheet => write!(f, "SHEET"),
-
             Function::Average => write!(f, "AVERAGE"),
             Function::Averagea => write!(f, "AVERAGEA"),
             Function::Averageif => write!(f, "AVERAGEIF"),
@@ -913,18 +1113,23 @@ impl fmt::Display for Function {
             Function::WorkdayIntl => write!(f, "WORKDAY.INTL"),
             Function::Yearfrac => write!(f, "YEARFRAC"),
             Function::Isoweeknum => write!(f, "ISOWEEKNUM"),
+            Function::Accrint => write!(f, "ACCRINT"),
+            Function::Accrintm => write!(f, "ACCRINTM"),
             Function::Pmt => write!(f, "PMT"),
             Function::Pv => write!(f, "PV"),
             Function::Rate => write!(f, "RATE"),
             Function::Nper => write!(f, "NPER"),
             Function::Fv => write!(f, "FV"),
+            Function::Fvschedule => write!(f, "FVSCHEDULE"),
             Function::Ppmt => write!(f, "PPMT"),
+            Function::Price => write!(f, "PRICE"),
             Function::Ipmt => write!(f, "IPMT"),
             Function::Npv => write!(f, "NPV"),
             Function::Mirr => write!(f, "MIRR"),
             Function::Irr => write!(f, "IRR"),
             Function::Xirr => write!(f, "XIRR"),
             Function::Xnpv => write!(f, "XNPV"),
+            Function::Yield => write!(f, "YIELD"),
             Function::Rept => write!(f, "REPT"),
             Function::Textafter => write!(f, "TEXTAFTER"),
             Function::Textbefore => write!(f, "TEXTBEFORE"),
@@ -936,10 +1141,25 @@ impl fmt::Display for Function {
             Function::Syd => write!(f, "SYD"),
             Function::Nominal => write!(f, "NOMINAL"),
             Function::Effect => write!(f, "EFFECT"),
+            Function::Duration => write!(f, "DURATION"),
+            Function::Mduration => write!(f, "MDURATION"),
             Function::Pduration => write!(f, "PDURATION"),
+            Function::Coupdaybs => write!(f, "COUPDAYBS"),
+            Function::Coupdays => write!(f, "COUPDAYS"),
+            Function::Coupdaysnc => write!(f, "COUPDAYSNC"),
+            Function::Coupncd => write!(f, "COUPNCD"),
+            Function::Coupnum => write!(f, "COUPNUM"),
+            Function::Couppcd => write!(f, "COUPPCD"),
             Function::Tbillyield => write!(f, "TBILLYIELD"),
             Function::Tbillprice => write!(f, "TBILLPRICE"),
             Function::Tbilleq => write!(f, "TBILLEQ"),
+            Function::Pricedisc => write!(f, "PRICEDISC"),
+            Function::Pricemat => write!(f, "PRICEMAT"),
+            Function::Yielddisc => write!(f, "YIELDDISC"),
+            Function::Yieldmat => write!(f, "YIELDMAT"),
+            Function::Disc => write!(f, "DISC"),
+            Function::Received => write!(f, "RECEIVED"),
+            Function::Intrate => write!(f, "INTRATE"),
             Function::Dollarde => write!(f, "DOLLARDE"),
             Function::Dollarfr => write!(f, "DOLLARFR"),
             Function::Ddb => write!(f, "DDB"),
@@ -1000,8 +1220,41 @@ impl fmt::Display for Function {
             Function::Convert => write!(f, "CONVERT"),
             Function::Delta => write!(f, "DELTA"),
             Function::Gestep => write!(f, "GESTEP"),
-
             Function::Subtotal => write!(f, "SUBTOTAL"),
+            Function::Exp => write!(f, "EXP"),
+            Function::Fact => write!(f, "FACT"),
+            Function::Factdouble => write!(f, "FACTDOUBLE"),
+            Function::Sign => write!(f, "SIGN"),
+            Function::Radians => write!(f, "RADIANS"),
+            Function::Degrees => write!(f, "DEGREES"),
+            Function::Int => write!(f, "INT"),
+            Function::Even => write!(f, "EVEN"),
+            Function::Odd => write!(f, "ODD"),
+            Function::Ceiling => write!(f, "CEILING"),
+            Function::CeilingMath => write!(f, "CEILING.MATH"),
+            Function::CeilingPrecise => write!(f, "CEILING.PRECISE"),
+            Function::Floor => write!(f, "FLOOR"),
+            Function::FloorMath => write!(f, "FLOOR.MATH"),
+            Function::FloorPrecise => write!(f, "FLOOR.PRECISE"),
+            Function::IsoCeiling => write!(f, "ISO.CEILING"),
+            Function::Mod => write!(f, "MOD"),
+            Function::Quotient => write!(f, "QUOTIENT"),
+            Function::Mround => write!(f, "MROUND"),
+            Function::Trunc => write!(f, "TRUNC"),
+            Function::Gcd => write!(f, "GCD"),
+            Function::Lcm => write!(f, "LCM"),
+            Function::Base => write!(f, "BASE"),
+            Function::Decimal => write!(f, "DECIMAL"),
+            Function::Roman => write!(f, "ROMAN"),
+            Function::Arabic => write!(f, "ARABIC"),
+            Function::Combin => write!(f, "COMBIN"),
+            Function::Combina => write!(f, "COMBINA"),
+            Function::Sumsq => write!(f, "SUMSQ"),
+
+            Function::N => write!(f, "N"),
+            Function::Cell => write!(f, "CELL"),
+            Function::Info => write!(f, "INFO"),
+            Function::Sheets => write!(f, "SHEETS"),
         }
     }
 }
@@ -1030,7 +1283,6 @@ impl Model {
         cell: CellReferenceIndex,
     ) -> CalcResult {
         match kind {
-            // Logical
             Function::And => self.fn_and(args, cell),
             Function::False => self.fn_false(args, cell),
             Function::If => self.fn_if(args, cell),
@@ -1042,34 +1294,27 @@ impl Model {
             Function::Switch => self.fn_switch(args, cell),
             Function::True => self.fn_true(args, cell),
             Function::Xor => self.fn_xor(args, cell),
-            // Math and trigonometry
             Function::Log => self.fn_log(args, cell),
             Function::Log10 => self.fn_log10(args, cell),
             Function::Ln => self.fn_ln(args, cell),
             Function::Sin => self.fn_sin(args, cell),
             Function::Cos => self.fn_cos(args, cell),
             Function::Tan => self.fn_tan(args, cell),
-
             Function::Asin => self.fn_asin(args, cell),
             Function::Acos => self.fn_acos(args, cell),
             Function::Atan => self.fn_atan(args, cell),
-
             Function::Sinh => self.fn_sinh(args, cell),
             Function::Cosh => self.fn_cosh(args, cell),
             Function::Tanh => self.fn_tanh(args, cell),
-
             Function::Asinh => self.fn_asinh(args, cell),
             Function::Acosh => self.fn_acosh(args, cell),
             Function::Atanh => self.fn_atanh(args, cell),
-
             Function::Pi => self.fn_pi(args, cell),
             Function::Abs => self.fn_abs(args, cell),
-
             Function::Sqrt => self.fn_sqrt(args, cell),
             Function::Sqrtpi => self.fn_sqrtpi(args, cell),
             Function::Atan2 => self.fn_atan2(args, cell),
             Function::Power => self.fn_power(args, cell),
-
             Function::Max => self.fn_max(args, cell),
             Function::Min => self.fn_min(args, cell),
             Function::Product => self.fn_product(args, cell),
@@ -1081,8 +1326,6 @@ impl Model {
             Function::Sum => self.fn_sum(args, cell),
             Function::Sumif => self.fn_sumif(args, cell),
             Function::Sumifs => self.fn_sumifs(args, cell),
-
-            // Lookup and Reference
             Function::Choose => self.fn_choose(args, cell),
             Function::Column => self.fn_column(args, cell),
             Function::Columns => self.fn_columns(args, cell),
@@ -1096,7 +1339,6 @@ impl Model {
             Function::Rows => self.fn_rows(args, cell),
             Function::Vlookup => self.fn_vlookup(args, cell),
             Function::Xlookup => self.fn_xlookup(args, cell),
-            // Text
             Function::Concatenate => self.fn_concatenate(args, cell),
             Function::Exact => self.fn_exact(args, cell),
             Function::Value => self.fn_value(args, cell),
@@ -1114,7 +1356,6 @@ impl Model {
             Function::Trim => self.fn_trim(args, cell),
             Function::Unicode => self.fn_unicode(args, cell),
             Function::Upper => self.fn_upper(args, cell),
-            // Information
             Function::Isnumber => self.fn_isnumber(args, cell),
             Function::Isnontext => self.fn_isnontext(args, cell),
             Function::Istext => self.fn_istext(args, cell),
@@ -1132,7 +1373,6 @@ impl Model {
             Function::Isformula => self.fn_isformula(args, cell),
             Function::Type => self.fn_type(args, cell),
             Function::Sheet => self.fn_sheet(args, cell),
-            // Statistical
             Function::Average => self.fn_average(args, cell),
             Function::Averagea => self.fn_averagea(args, cell),
             Function::Averageif => self.fn_averageif(args, cell),
@@ -1145,7 +1385,6 @@ impl Model {
             Function::Maxifs => self.fn_maxifs(args, cell),
             Function::Minifs => self.fn_minifs(args, cell),
             Function::Geomean => self.fn_geomean(args, cell),
-            // Date and Time
             Function::Year => self.fn_year(args, cell),
             Function::Day => self.fn_day(args, cell),
             Function::Eomonth => self.fn_eomonth(args, cell),
@@ -1172,18 +1411,23 @@ impl Model {
             Function::Yearfrac => self.fn_yearfrac(args, cell),
             Function::Isoweeknum => self.fn_isoweeknum(args, cell),
             // Financial
+            Function::Accrint => self.fn_accrint(args, cell),
+            Function::Accrintm => self.fn_accrintm(args, cell),
             Function::Pmt => self.fn_pmt(args, cell),
             Function::Pv => self.fn_pv(args, cell),
             Function::Rate => self.fn_rate(args, cell),
             Function::Nper => self.fn_nper(args, cell),
             Function::Fv => self.fn_fv(args, cell),
+            Function::Fvschedule => self.fn_fvschedule(args, cell),
             Function::Ppmt => self.fn_ppmt(args, cell),
+            Function::Price => self.fn_price(args, cell),
             Function::Ipmt => self.fn_ipmt(args, cell),
             Function::Npv => self.fn_npv(args, cell),
             Function::Mirr => self.fn_mirr(args, cell),
             Function::Irr => self.fn_irr(args, cell),
             Function::Xirr => self.fn_xirr(args, cell),
             Function::Xnpv => self.fn_xnpv(args, cell),
+            Function::Yield => self.fn_yield(args, cell),
             Function::Rept => self.fn_rept(args, cell),
             Function::Textafter => self.fn_textafter(args, cell),
             Function::Textbefore => self.fn_textbefore(args, cell),
@@ -1195,17 +1439,31 @@ impl Model {
             Function::Syd => self.fn_syd(args, cell),
             Function::Nominal => self.fn_nominal(args, cell),
             Function::Effect => self.fn_effect(args, cell),
+            Function::Duration => self.fn_duration(args, cell),
+            Function::Mduration => self.fn_mduration(args, cell),
             Function::Pduration => self.fn_pduration(args, cell),
+            Function::Coupdaybs => self.fn_coupdaybs(args, cell),
+            Function::Coupdays => self.fn_coupdays(args, cell),
+            Function::Coupdaysnc => self.fn_coupdaysnc(args, cell),
+            Function::Coupncd => self.fn_coupncd(args, cell),
+            Function::Coupnum => self.fn_coupnum(args, cell),
+            Function::Couppcd => self.fn_couppcd(args, cell),
             Function::Tbillyield => self.fn_tbillyield(args, cell),
             Function::Tbillprice => self.fn_tbillprice(args, cell),
             Function::Tbilleq => self.fn_tbilleq(args, cell),
+            Function::Pricedisc => self.fn_pricedisc(args, cell),
+            Function::Pricemat => self.fn_pricemat(args, cell),
+            Function::Yielddisc => self.fn_yielddisc(args, cell),
+            Function::Yieldmat => self.fn_yieldmat(args, cell),
+            Function::Disc => self.fn_disc(args, cell),
+            Function::Received => self.fn_received(args, cell),
+            Function::Intrate => self.fn_intrate(args, cell),
             Function::Dollarde => self.fn_dollarde(args, cell),
             Function::Dollarfr => self.fn_dollarfr(args, cell),
             Function::Ddb => self.fn_ddb(args, cell),
             Function::Db => self.fn_db(args, cell),
             Function::Cumprinc => self.fn_cumprinc(args, cell),
             Function::Cumipmt => self.fn_cumipmt(args, cell),
-            // Engineering
             Function::Besseli => self.fn_besseli(args, cell),
             Function::Besselj => self.fn_besselj(args, cell),
             Function::Besselk => self.fn_besselk(args, cell),
@@ -1260,8 +1518,48 @@ impl Model {
             Function::Convert => self.fn_convert(args, cell),
             Function::Delta => self.fn_delta(args, cell),
             Function::Gestep => self.fn_gestep(args, cell),
-
             Function::Subtotal => self.fn_subtotal(args, cell),
+            Function::Acot => self.fn_acot(args, cell),
+            Function::Acoth => self.fn_acoth(args, cell),
+            Function::Cot => self.fn_cot(args, cell),
+            Function::Coth => self.fn_coth(args, cell),
+            Function::Csc => self.fn_csc(args, cell),
+            Function::Csch => self.fn_csch(args, cell),
+            Function::Sec => self.fn_sec(args, cell),
+            Function::Sech => self.fn_sech(args, cell),
+            Function::Exp => self.fn_exp(args, cell),
+            Function::Fact => self.fn_fact(args, cell),
+            Function::Factdouble => self.fn_factdouble(args, cell),
+            Function::Sign => self.fn_sign(args, cell),
+            Function::Radians => self.fn_radians(args, cell),
+            Function::Degrees => self.fn_degrees(args, cell),
+            Function::Int => self.fn_int(args, cell),
+            Function::Even => self.fn_even(args, cell),
+            Function::Odd => self.fn_odd(args, cell),
+            Function::Ceiling => self.fn_ceiling(args, cell),
+            Function::CeilingMath => self.fn_ceiling_math(args, cell),
+            Function::CeilingPrecise => self.fn_ceiling_precise(args, cell),
+            Function::Floor => self.fn_floor(args, cell),
+            Function::FloorMath => self.fn_floor_math(args, cell),
+            Function::FloorPrecise => self.fn_floor_precise(args, cell),
+            Function::IsoCeiling => self.fn_iso_ceiling(args, cell),
+            Function::Mod => self.fn_mod(args, cell),
+            Function::Quotient => self.fn_quotient(args, cell),
+            Function::Mround => self.fn_mround(args, cell),
+            Function::Trunc => self.fn_trunc(args, cell),
+            Function::Gcd => self.fn_gcd(args, cell),
+            Function::Lcm => self.fn_lcm(args, cell),
+            Function::Base => self.fn_base(args, cell),
+            Function::Decimal => self.fn_decimal(args, cell),
+            Function::Roman => self.fn_roman(args, cell),
+            Function::Arabic => self.fn_arabic(args, cell),
+            Function::Combin => self.fn_combin(args, cell),
+            Function::Combina => self.fn_combina(args, cell),
+            Function::Sumsq => self.fn_sumsq(args, cell),
+            Function::N => self.fn_n(args, cell),
+            Function::Cell => self.fn_cell(args, cell),
+            Function::Info => self.fn_info(args, cell),
+            Function::Sheets => self.fn_sheets(args, cell),
         }
     }
 }

base/src/test/mod.rs

@@ -9,15 +9,21 @@ mod test_currency;
 mod test_date_and_time;
 mod test_datedif_leap_month_end;
 mod test_days360_month_end;
+mod test_degrees_radians;
 mod test_error_propagation;
+mod test_fn_accrint;
+mod test_fn_accrintm;
 mod test_fn_average;
 mod test_fn_averageifs;
 mod test_fn_choose;
 mod test_fn_concatenate;
 mod test_fn_count;
+mod test_fn_coupon;
 mod test_fn_day;
+mod test_fn_duration;
 mod test_fn_exact;
 mod test_fn_financial;
+mod test_fn_financial_bonds;
 mod test_fn_formulatext;
 mod test_fn_if;
 mod test_fn_maxifs;
@@ -62,18 +68,21 @@ mod test_escape_quotes;
 mod test_extend;
 mod test_fn_fv;
 mod test_fn_round;
+mod test_fn_fvschedule;
 mod test_fn_type;
 mod test_frozen_rows_and_columns;
 mod test_geomean;
 mod test_get_cell_content;
 mod test_implicit_intersection;
 mod test_issue_155;
+mod test_issue_483;
 mod test_ln;
 mod test_log;
 mod test_log10;
 mod test_networkdays;
 mod test_percentage;
 mod test_set_functions_error_handling;
+mod test_sheet_names;
 mod test_today;
 mod test_types;
 mod user_model;

base/src/test/test_degrees_radians.rs

@@ -0,0 +1,22 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn fn_degrees_radians_arguments() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DEGREES()");
+    model._set("A2", "=RADIANS()");
+    model._set("A3", "=RADIANS(180)");
+    model._set("A4", "=RADIANS(180, 2)");
+    model._set("A5", "=DEGREES(RADIANS(180))");
+    model._set("A6", "=DEGREES(1, 2)");
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
+    assert_eq!(model._get_text("A2"), *"#ERROR!");
+    assert_eq!(model._get_text("A3"), *"3.141592654");
+    assert_eq!(model._get_text("A4"), *"#ERROR!");
+    assert_eq!(model._get_text("A5"), *"180");
+    assert_eq!(model._get_text("A6"), *"#ERROR!");
+}

base/src/test/test_fn_accrint.rs

@@ -0,0 +1,134 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+#[test]
+fn fn_accrint() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,1,1)");
+    model._set("A3", "=DATE(2020,1,31)");
+    model._set("A4", "10%");
+    model._set("A5", "$1,000");
+    model._set("A6", "2");
+
+    model._set("B1", "=ACCRINT(A1,A2,A3,A4,A5,A6)");
+    model._set("C1", "=ACCRINT(A1)");
+    model._set("C2", "=ACCRINT(A1,A2,A3,A4,A5,3)");
+
+    model.evaluate();
+
+    match model.get_cell_value_by_ref("Sheet1!B1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 8.333333333333334).abs() < 1e-9);
+        }
+        other => unreachable!("Expected number for B1, got {:?}", other),
+    }
+    assert_eq!(model._get_text("C1"), *"#ERROR!");
+    assert_eq!(model._get_text("C2"), *"#NUM!");
+}
+
+#[test]
+fn fn_accrint_parameters() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,1,1)");
+    model._set("A3", "=DATE(2020,7,1)");
+    model._set("A4", "8%");
+    model._set("A5", "1000");
+
+    model._set("B1", "=ACCRINT(A1,A2,A3,A4,A5,2,0,TRUE)");
+    model._set("B2", "=ACCRINT(A1,A2,A3,A4,A5,2,1,TRUE)");
+    model._set("B3", "=ACCRINT(A1,A2,A3,A4,A5,2,4,TRUE)");
+    model._set("B4", "=ACCRINT(A1,A2,A3,A4,A5,1)");
+    model._set("B5", "=ACCRINT(A1,A2,A3,A4,A5,4)");
+    model._set("B6", "=ACCRINT(A1,A2,A3,A4,A5,2)");
+    model._set("B7", "=ACCRINT(A1,A2,A3,A4,A5,2,0)");
+
+    model.evaluate();
+
+    match model.get_cell_value_by_ref("Sheet1!B1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 40.0).abs() < 1e-9);
+        }
+        other => unreachable!("Expected number for B1, got {:?}", other),
+    }
+
+    match (
+        model.get_cell_value_by_ref("Sheet1!B1"),
+        model.get_cell_value_by_ref("Sheet1!B6"),
+    ) {
+        (Ok(CellValue::Number(v1)), Ok(CellValue::Number(v2))) => {
+            assert!((v1 - v2).abs() < 1e-12);
+        }
+        other => unreachable!("Expected matching numbers, got {:?}", other),
+    }
+}
+
+#[test]
+fn fn_accrint_errors() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,1,1)");
+    model._set("A3", "=DATE(2020,7,1)");
+    model._set("A4", "8%");
+    model._set("A5", "1000");
+
+    model._set("B1", "=ACCRINT()");
+    model._set("B2", "=ACCRINT(A1,A2,A3,A4,A5)");
+    model._set("B3", "=ACCRINT(A1,A2,A3,A4,A5,2,0,TRUE,1)");
+    model._set("C1", "=ACCRINT(A1,A2,A3,A4,A5,0)");
+    model._set("C2", "=ACCRINT(A1,A2,A3,A4,A5,3)");
+    model._set("C3", "=ACCRINT(A1,A2,A3,A4,A5,-1)");
+    model._set("D1", "=ACCRINT(A1,A2,A3,A4,A5,2,-1)");
+    model._set("D2", "=ACCRINT(A1,A2,A3,A4,A5,2,5)");
+    model._set("E1", "=ACCRINT(A3,A2,A1,A4,A5,2)");
+    model._set("E2", "=ACCRINT(A1,A3,A1,A4,A5,2)");
+    model._set("F1", "=ACCRINT(A1,A2,A3,A4,0,2)");
+    model._set("F2", "=ACCRINT(A1,A2,A3,A4,-1000,2)");
+    model._set("F3", "=ACCRINT(A1,A2,A3,-8%,A5,2)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+    assert_eq!(model._get_text("C1"), *"#NUM!");
+    assert_eq!(model._get_text("C2"), *"#NUM!");
+    assert_eq!(model._get_text("C3"), *"#NUM!");
+    assert_eq!(model._get_text("D1"), *"#NUM!");
+    assert_eq!(model._get_text("D2"), *"#NUM!");
+    assert_eq!(model._get_text("E1"), *"#NUM!");
+    assert_eq!(model._get_text("E2"), *"#NUM!");
+    assert_eq!(model._get_text("F2"), *"#NUM!");
+    assert_eq!(model._get_text("F3"), *"#NUM!");
+
+    match model.get_cell_value_by_ref("Sheet1!F1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 0.0).abs() < 1e-9);
+        }
+        other => unreachable!("Expected 0 for F1, got {:?}", other),
+    }
+}
+
+#[test]
+fn fn_accrint_combined() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2018,10,15)");
+    model._set("A2", "=DATE(2019,2,1)");
+    model._set("A3", "5%");
+    model._set("A4", "1000");
+
+    model._set("B1", "=ACCRINT(A1,A1,A2,A3,A4,2)");
+
+    model.evaluate();
+
+    match model.get_cell_value_by_ref("Sheet1!B1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 14.722222222222221).abs() < 1e-9);
+        }
+        other => unreachable!("Expected number for B1, got {:?}", other),
+    }
+}

base/src/test/test_fn_accrintm.rs

@@ -0,0 +1,122 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+#[test]
+fn fn_accrintm() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,7,1)");
+    model._set("A3", "10%");
+    model._set("A4", "$1,000");
+
+    model._set("B1", "=ACCRINTM(A1,A2,A3,A4)");
+    model._set("C1", "=ACCRINTM(A1)");
+
+    model.evaluate();
+
+    match model.get_cell_value_by_ref("Sheet1!B1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 50.0).abs() < 1e-9);
+        }
+        other => unreachable!("Expected number for B1, got {:?}", other),
+    }
+    assert_eq!(model._get_text("C1"), *"#ERROR!");
+}
+
+#[test]
+fn fn_accrintm_parameters() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,7,1)");
+    model._set("A3", "8%");
+    model._set("A4", "1000");
+
+    model._set("B1", "=ACCRINTM(A1,A2,A3,A4,0)");
+    model._set("B2", "=ACCRINTM(A1,A2,A3,A4,1)");
+    model._set("B3", "=ACCRINTM(A1,A2,A3,A4,4)");
+    model._set("C1", "=ACCRINTM(A1,A2,A3,A4)");
+
+    model.evaluate();
+
+    match (
+        model.get_cell_value_by_ref("Sheet1!B1"),
+        model.get_cell_value_by_ref("Sheet1!B2"),
+    ) {
+        (Ok(CellValue::Number(v1)), Ok(CellValue::Number(v2))) => {
+            assert!(v1 > 0.0 && v2 > 0.0);
+        }
+        other => unreachable!("Expected numbers for basis test, got {:?}", other),
+    }
+
+    match (
+        model.get_cell_value_by_ref("Sheet1!B1"),
+        model.get_cell_value_by_ref("Sheet1!C1"),
+    ) {
+        (Ok(CellValue::Number(v1)), Ok(CellValue::Number(v2))) => {
+            assert!((v1 - v2).abs() < 1e-12);
+        }
+        other => unreachable!(
+            "Expected matching numbers for default test, got {:?}",
+            other
+        ),
+    }
+}
+
+#[test]
+fn fn_accrintm_errors() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2020,7,1)");
+    model._set("A3", "8%");
+    model._set("A4", "1000");
+
+    model._set("B1", "=ACCRINTM()");
+    model._set("B2", "=ACCRINTM(A1,A2,A3)");
+    model._set("B3", "=ACCRINTM(A1,A2,A3,A4,0,1)");
+    model._set("C1", "=ACCRINTM(A1,A2,A3,A4,-1)");
+    model._set("C2", "=ACCRINTM(A1,A2,A3,A4,5)");
+    model._set("D1", "=ACCRINTM(A2,A1,A3,A4)");
+    model._set("E1", "=ACCRINTM(A1,A2,A3,0)");
+    model._set("E2", "=ACCRINTM(A1,A2,A3,-1000)");
+    model._set("E3", "=ACCRINTM(A1,A2,-8%,A4)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+    assert_eq!(model._get_text("C1"), *"#NUM!");
+    assert_eq!(model._get_text("C2"), *"#NUM!");
+    assert_eq!(model._get_text("D1"), *"#NUM!");
+    assert_eq!(model._get_text("E2"), *"#NUM!");
+    assert_eq!(model._get_text("E3"), *"#NUM!");
+
+    match model.get_cell_value_by_ref("Sheet1!E1") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 0.0).abs() < 1e-9);
+        }
+        other => unreachable!("Expected 0 for E1, got {:?}", other),
+    }
+}
+
+#[test]
+fn fn_accrintm_combined() {
+    let mut model = new_empty_model();
+    model._set("C1", "=DATE(2016,4,5)");
+    model._set("C2", "=DATE(2019,2,1)");
+    model._set("A3", "5%");
+    model._set("A4", "1000");
+    model._set("B2", "=ACCRINTM(C1,C2,A3,A4)");
+
+    model.evaluate();
+
+    match model.get_cell_value_by_ref("Sheet1!B2") {
+        Ok(CellValue::Number(v)) => {
+            assert!((v - 141.11111111111111).abs() < 1e-9);
+        }
+        other => unreachable!("Expected number for B2, got {:?}", other),
+    }
+}

base/src/test/test_fn_coupon.rs

@@ -0,0 +1,260 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+#[test]
+fn fn_coupon_functions() {
+    let mut model = new_empty_model();
+
+    // Test with basis 1 (original test)
+    model._set("A1", "=DATE(2001,1,25)");
+    model._set("A2", "=DATE(2001,11,15)");
+    model._set("B1", "=COUPDAYBS(A1,A2,2,1)");
+    model._set("B2", "=COUPDAYS(A1,A2,2,1)");
+    model._set("B3", "=COUPDAYSNC(A1,A2,2,1)");
+    model._set("B4", "=COUPNCD(A1,A2,2,1)");
+    model._set("B5", "=COUPNUM(A1,A2,2,1)");
+    model._set("B6", "=COUPPCD(A1,A2,2,1)");
+
+    // Test with basis 3 for better coverage
+    model._set("C1", "=COUPDAYBS(DATE(2001,1,25),DATE(2001,11,15),2,3)");
+    model._set("C2", "=COUPDAYS(DATE(2001,1,25),DATE(2001,11,15),2,3)");
+    model._set("C3", "=COUPDAYSNC(DATE(2001,1,25),DATE(2001,11,15),2,3)");
+    model._set("C4", "=COUPNCD(DATE(2001,1,25),DATE(2001,11,15),2,3)");
+    model._set("C5", "=COUPNUM(DATE(2007,1,25),DATE(2008,11,15),2,1)");
+    model._set("C6", "=COUPPCD(DATE(2001,1,25),DATE(2001,11,15),2,3)");
+
+    model.evaluate();
+
+    // Test basis 1
+    assert_eq!(model._get_text("B1"), "71");
+    assert_eq!(model._get_text("B2"), "181");
+    assert_eq!(model._get_text("B3"), "110");
+    assert_eq!(
+        model.get_cell_value_by_ref("Sheet1!B4"),
+        Ok(CellValue::Number(37026.0))
+    );
+    assert_eq!(model._get_text("B5"), "2");
+    assert_eq!(
+        model.get_cell_value_by_ref("Sheet1!B6"),
+        Ok(CellValue::Number(36845.0))
+    );
+
+    // Test basis 3 (more comprehensive coverage)
+    assert_eq!(model._get_text("C1"), "71");
+    assert_eq!(model._get_text("C2"), "181"); // Fixed: actual days
+    assert_eq!(model._get_text("C3"), "110");
+    assert_eq!(model._get_text("C4"), "37026");
+    assert_eq!(model._get_text("C5"), "4");
+    assert_eq!(model._get_text("C6"), "36845");
+}
+
+#[test]
+fn fn_coupon_functions_error_cases() {
+    let mut model = new_empty_model();
+
+    // Test invalid frequency
+    model._set("E1", "=COUPDAYBS(DATE(2001,1,25),DATE(2001,11,15),3,1)");
+    // Test invalid basis
+    model._set("E2", "=COUPDAYS(DATE(2001,1,25),DATE(2001,11,15),2,5)");
+    // Test settlement >= maturity
+    model._set("E3", "=COUPDAYSNC(DATE(2001,11,15),DATE(2001,1,25),2,1)");
+    // Test too few arguments
+    model._set("E4", "=COUPNCD(DATE(2001,1,25),DATE(2001,11,15))");
+    // Test too many arguments
+    model._set("E5", "=COUPNUM(DATE(2001,1,25),DATE(2001,11,15),2,1,1)");
+
+    model.evaluate();
+
+    // All should return errors
+    assert_eq!(model._get_text("E1"), "#NUM!");
+    assert_eq!(model._get_text("E2"), "#NUM!");
+    assert_eq!(model._get_text("E3"), "#NUM!");
+    assert_eq!(model._get_text("E4"), *"#ERROR!");
+    assert_eq!(model._get_text("E5"), *"#ERROR!");
+}
+
+#[test]
+fn fn_coupdays_actual_day_count_fix() {
+    // Verify COUPDAYS correctly distinguishes between fixed vs actual day count methods
+    // Bug: basis 2&3 were incorrectly using fixed calculations like basis 0&4
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2023,1,15)");
+    model._set("A2", "=DATE(2023,7,15)");
+
+    model._set("B1", "=COUPDAYS(A1,A2,2,0)"); // 30/360: uses 360/freq
+    model._set("B2", "=COUPDAYS(A1,A2,2,2)"); // Actual/360: uses actual days
+    model._set("B3", "=COUPDAYS(A1,A2,2,3)"); // Actual/365: uses actual days
+    model._set("B4", "=COUPDAYS(A1,A2,2,4)"); // 30/360 European: uses 360/freq
+
+    model.evaluate();
+
+    // Basis 0&4: theoretical 360/2 = 180 days
+    assert_eq!(model._get_text("B1"), "180");
+    assert_eq!(model._get_text("B4"), "180");
+
+    // Basis 2&3: actual days between Jan 15 and Jul 15 = 181 days
+    assert_eq!(model._get_text("B2"), "181");
+    assert_eq!(model._get_text("B3"), "181");
+}
+
+// =============================================================================
+// FEBRUARY EDGE CASE TESTS - Day Count Convention Compliance
+// =============================================================================
+// These tests verify that financial functions correctly handle February dates
+// according to the official 30/360 day count convention specifications.
+
+#[test]
+fn test_coupon_functions_february_consistency() {
+    let mut model = new_empty_model();
+
+    // Test that coupon functions behave consistently between US and European methods
+    // when February dates are involved
+
+    // Settlement: Last day of February (non-leap year)
+    // Maturity: Some date in following year that creates a clear test case
+    model._set("A1", "=DATE(2023,2,28)"); // Last day of Feb, non-leap year
+    model._set("A2", "=DATE(2024,2,28)"); // Same day next year
+
+    // Test COUPDAYS with different basis values
+    model._set("B1", "=COUPDAYS(A1,A2,2,0)"); // US 30/360 - should treat Feb 28 as day 30
+    model._set("B2", "=COUPDAYS(A1,A2,2,4)"); // European 30/360 - should treat Feb 28 as day 28
+    model._set("B3", "=COUPDAYS(A1,A2,2,1)"); // Actual/actual - should use real days
+
+    model.evaluate();
+
+    // All should return valid numbers (no errors)
+    assert_ne!(model._get_text("B1"), *"#NUM!");
+    assert_ne!(model._get_text("B2"), *"#NUM!");
+    assert_ne!(model._get_text("B3"), *"#NUM!");
+
+    // US and European 30/360 should potentially give different results for February dates
+    // (though the exact difference depends on the specific coupon calculation logic)
+    let us_result = model._get_text("B1");
+    let european_result = model._get_text("B2");
+    let actual_result = model._get_text("B3");
+
+    // Verify all are numeric
+    assert!(us_result.parse::<f64>().is_ok());
+    assert!(european_result.parse::<f64>().is_ok());
+    assert!(actual_result.parse::<f64>().is_ok());
+}
+
+#[test]
+fn test_february_edge_cases_leap_vs_nonleap() {
+    let mut model = new_empty_model();
+
+    // Test leap year vs non-leap year February handling
+
+    // Feb 28 in non-leap year (this IS the last day of February)
+    model._set("A1", "=DATE(2023,2,28)");
+    model._set("A2", "=DATE(2023,8,28)");
+
+    // Feb 28 in leap year (this is NOT the last day of February)
+    model._set("A3", "=DATE(2024,2,28)");
+    model._set("A4", "=DATE(2024,8,28)");
+
+    // Feb 29 in leap year (this IS the last day of February)
+    model._set("A5", "=DATE(2024,2,29)");
+    model._set("A6", "=DATE(2024,8,29)");
+
+    // Test with basis 0 (US 30/360) - should have special February handling
+    model._set("B1", "=COUPDAYS(A1,A2,2,0)"); // Feb 28 non-leap (last day)
+    model._set("B2", "=COUPDAYS(A3,A4,2,0)"); // Feb 28 leap year (not last day)
+    model._set("B3", "=COUPDAYS(A5,A6,2,0)"); // Feb 29 leap year (last day)
+
+    model.evaluate();
+
+    // All should succeed
+    assert_ne!(model._get_text("B1"), *"#NUM!");
+    assert_ne!(model._get_text("B2"), *"#NUM!");
+    assert_ne!(model._get_text("B3"), *"#NUM!");
+
+    // Verify they're all numeric
+    assert!(model._get_text("B1").parse::<f64>().is_ok());
+    assert!(model._get_text("B2").parse::<f64>().is_ok());
+    assert!(model._get_text("B3").parse::<f64>().is_ok());
+}
+
+#[test]
+fn test_us_nasd_both_february_rule() {
+    let mut model = new_empty_model();
+
+    // Test the specific US/NASD rule: "If both date A and B fall on the last day of February,
+    // then date B will be changed to the 30th"
+
+    // Case 1: Both dates are Feb 28 in non-leap years (both are last day of February)
+    model._set("A1", "=DATE(2023,2,28)"); // Last day of Feb 2023
+    model._set("A2", "=DATE(2025,2,28)"); // Last day of Feb 2025
+
+    // Case 2: Both dates are Feb 29 in leap years (both are last day of February)
+    model._set("A3", "=DATE(2024,2,29)"); // Last day of Feb 2024
+    model._set("A4", "=DATE(2028,2,29)"); // Last day of Feb 2028
+
+    // Case 3: Mixed - Feb 28 non-leap to Feb 29 leap (both are last day of February)
+    model._set("A5", "=DATE(2023,2,28)"); // Last day of Feb 2023
+    model._set("A6", "=DATE(2024,2,29)"); // Last day of Feb 2024
+
+    // Case 4: Control - Feb 28 in leap year (NOT last day) to Feb 29 (IS last day)
+    model._set("A7", "=DATE(2024,2,28)"); // NOT last day of Feb 2024
+    model._set("A8", "=DATE(2024,2,29)"); // IS last day of Feb 2024
+
+    // Test using coupon functions that should apply US/NASD 30/360 (basis 0)
+    model._set("B1", "=COUPDAYS(A1,A2,1,0)"); // Both last day Feb - Rule 1 should apply
+    model._set("B2", "=COUPDAYS(A3,A4,1,0)"); // Both last day Feb - Rule 1 should apply
+    model._set("B3", "=COUPDAYS(A5,A6,1,0)"); // Both last day Feb - Rule 1 should apply
+    model._set("B4", "=COUPDAYS(A7,A8,1,0)"); // Only end is last day Feb - Rule 1 should NOT apply
+
+    // Compare with European method (basis 4) - should behave differently
+    model._set("C1", "=COUPDAYS(A1,A2,1,4)"); // European - no special Feb handling
+    model._set("C2", "=COUPDAYS(A3,A4,1,4)"); // European - no special Feb handling
+    model._set("C3", "=COUPDAYS(A5,A6,1,4)"); // European - no special Feb handling
+    model._set("C4", "=COUPDAYS(A7,A8,1,4)"); // European - no special Feb handling
+
+    model.evaluate();
+
+    // All should succeed without errors
+    for row in ["B1", "B2", "B3", "B4", "C1", "C2", "C3", "C4"] {
+        assert_ne!(model._get_text(row), *"#NUM!", "Failed for {row}");
+        assert!(
+            model._get_text(row).parse::<f64>().is_ok(),
+            "Non-numeric result for {row}"
+        );
+    }
+}
+
+#[test]
+fn test_coupon_functions_february_edge_cases() {
+    let mut model = new_empty_model();
+
+    // Test that coupon functions handle February dates correctly without errors
+
+    // Settlement: February 28, 2023 (non-leap), Maturity: February 28, 2024 (leap)
+    model._set("A1", "=DATE(2023,2,28)");
+    model._set("A2", "=DATE(2024,2,28)");
+
+    // Test with basis 0 (US 30/360 - should use special February handling)
+    model._set("B1", "=COUPDAYBS(A1,A2,2,0)");
+    model._set("B2", "=COUPDAYS(A1,A2,2,0)");
+    model._set("B3", "=COUPDAYSNC(A1,A2,2,0)");
+
+    // Test with basis 4 (European 30/360 - should NOT use special February handling)
+    model._set("C1", "=COUPDAYBS(A1,A2,2,4)");
+    model._set("C2", "=COUPDAYS(A1,A2,2,4)");
+    model._set("C3", "=COUPDAYSNC(A1,A2,2,4)");
+
+    model.evaluate();
+
+    // With US method (basis 0), February dates should be handled specially
+    // With European method (basis 4), February dates should use actual dates
+    // Key point: both should work without errors
+
+    // We're ensuring functions complete successfully with February dates
+    assert_ne!(model._get_text("B1"), *"#NUM!");
+    assert_ne!(model._get_text("B2"), *"#NUM!");
+    assert_ne!(model._get_text("B3"), *"#NUM!");
+    assert_ne!(model._get_text("C1"), *"#NUM!");
+    assert_ne!(model._get_text("C2"), *"#NUM!");
+    assert_ne!(model._get_text("C3"), *"#NUM!");
+}

base/src/test/test_fn_duration.rs

@@ -0,0 +1,350 @@
+#![allow(clippy::unwrap_used)]
+#![allow(clippy::panic)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+// Test constants for realistic bond scenarios
+const BOND_SETTLEMENT: &str = "=DATE(2020,1,1)";
+const BOND_MATURITY_4Y: &str = "=DATE(2024,1,1)";
+const BOND_MATURITY_INVALID: &str = "=DATE(2016,1,1)"; // Before settlement
+const BOND_MATURITY_SAME: &str = "=DATE(2020,1,1)"; // Same as settlement
+const BOND_MATURITY_1DAY: &str = "=DATE(2020,1,2)"; // Very short term
+
+// Standard investment-grade corporate bond parameters
+const STD_COUPON: f64 = 0.08; // 8% annual coupon rate
+const STD_YIELD: f64 = 0.09; // 9% yield (discount bond scenario)
+const STD_FREQUENCY: i32 = 2; // Semi-annual payments (most common)
+
+// Helper function to reduce test repetition
+fn assert_numerical_result(model: &crate::Model, cell_ref: &str, should_be_positive: bool) {
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref(cell_ref) {
+        if should_be_positive {
+            assert!(v > 0.0, "Expected positive value at {cell_ref}, got {v}");
+        }
+        // Value is valid - test passes
+    } else {
+        panic!("Expected numerical result at {cell_ref}");
+    }
+}
+
+#[test]
+fn fn_duration_mduration_arguments() {
+    let mut model = new_empty_model();
+
+    // Test argument count validation
+    model._set("A1", "=DURATION()");
+    model._set("A2", "=DURATION(1,2,3,4)");
+    model._set("A3", "=DURATION(1,2,3,4,5,6,7)");
+
+    model._set("B1", "=MDURATION()");
+    model._set("B2", "=MDURATION(1,2,3,4)");
+    model._set("B3", "=MDURATION(1,2,3,4,5,6,7)");
+
+    model.evaluate();
+
+    // Too few or too many arguments should result in errors
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
+    assert_eq!(model._get_text("A2"), *"#ERROR!");
+    assert_eq!(model._get_text("A3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+}
+
+#[test]
+fn fn_duration_mduration_settlement_maturity_errors() {
+    let mut model = new_empty_model();
+
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_INVALID); // Before settlement
+    model._set("A3", BOND_MATURITY_SAME); // Same as settlement
+
+    // Both settlement > maturity and settlement = maturity should error
+    model._set(
+        "B1",
+        &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B2",
+        &format!("=DURATION(A1,A3,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B3",
+        &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B4",
+        &format!("=MDURATION(A1,A3,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("B3"), *"#NUM!");
+    assert_eq!(model._get_text("B4"), *"#NUM!");
+}
+
+#[test]
+fn fn_duration_mduration_negative_values_errors() {
+    let mut model = new_empty_model();
+
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_4Y);
+
+    // Test negative coupon (coupons must be >= 0)
+    model._set(
+        "B1",
+        &format!("=DURATION(A1,A2,-0.01,{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B2",
+        &format!("=MDURATION(A1,A2,-0.01,{STD_YIELD},{STD_FREQUENCY})"),
+    );
+
+    // Test negative yield (yields must be >= 0)
+    model._set(
+        "C1",
+        &format!("=DURATION(A1,A2,{STD_COUPON},-0.01,{STD_FREQUENCY})"),
+    );
+    model._set(
+        "C2",
+        &format!("=MDURATION(A1,A2,{STD_COUPON},-0.01,{STD_FREQUENCY})"),
+    );
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("C1"), *"#NUM!");
+    assert_eq!(model._get_text("C2"), *"#NUM!");
+}
+
+#[test]
+fn fn_duration_mduration_invalid_frequency_errors() {
+    let mut model = new_empty_model();
+
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_4Y);
+
+    // Only 1, 2, and 4 are valid frequencies (annual, semi-annual, quarterly)
+    let invalid_frequencies = [0, 3, 5, 12]; // Common invalid values
+
+    for (i, &freq) in invalid_frequencies.iter().enumerate() {
+        let row = i + 1;
+        model._set(
+            &format!("B{row}"),
+            &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{freq})"),
+        );
+        model._set(
+            &format!("C{row}"),
+            &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{freq})"),
+        );
+    }
+
+    model.evaluate();
+
+    for i in 1..=invalid_frequencies.len() {
+        assert_eq!(model._get_text(&format!("B{i}")), *"#NUM!");
+        assert_eq!(model._get_text(&format!("C{i}")), *"#NUM!");
+    }
+}
+
+#[test]
+fn fn_duration_mduration_frequency_variations() {
+    let mut model = new_empty_model();
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_4Y);
+
+    // Test all valid frequencies: 1=annual, 2=semi-annual, 4=quarterly
+    let valid_frequencies = [1, 2, 4];
+
+    for (i, &freq) in valid_frequencies.iter().enumerate() {
+        let row = i + 1;
+        model._set(
+            &format!("B{row}"),
+            &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{freq})"),
+        );
+        model._set(
+            &format!("C{row}"),
+            &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{freq})"),
+        );
+    }
+
+    model.evaluate();
+
+    // All should return positive numerical values
+    for i in 1..=valid_frequencies.len() {
+        assert_numerical_result(&model, &format!("Sheet1!B{i}"), true);
+        assert_numerical_result(&model, &format!("Sheet1!C{i}"), true);
+    }
+}
+
+#[test]
+fn fn_duration_mduration_basis_variations() {
+    let mut model = new_empty_model();
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_4Y);
+
+    // Test all valid basis values (day count conventions)
+    // 0=30/360 US, 1=Actual/actual, 2=Actual/360, 3=Actual/365, 4=30/360 European
+    for basis in 0..=4 {
+        let row = basis + 1;
+        model._set(
+            &format!("B{row}"),
+            &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY},{basis})"),
+        );
+        model._set(
+            &format!("C{row}"),
+            &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY},{basis})"),
+        );
+    }
+
+    // Test default basis (should be 0)
+    model._set(
+        "D1",
+        &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "D2",
+        &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+
+    model.evaluate();
+
+    // All basis values should work
+    for row in 1..=5 {
+        assert_numerical_result(&model, &format!("Sheet1!B{row}"), true);
+        assert_numerical_result(&model, &format!("Sheet1!C{row}"), true);
+    }
+
+    // Default basis should match basis 0
+    if let (Ok(CellValue::Number(d1)), Ok(CellValue::Number(b1))) = (
+        model.get_cell_value_by_ref("Sheet1!D1"),
+        model.get_cell_value_by_ref("Sheet1!B1"),
+    ) {
+        assert!(
+            (d1 - b1).abs() < 1e-10,
+            "Default basis should match basis 0"
+        );
+    }
+}
+
+#[test]
+fn fn_duration_mduration_edge_cases() {
+    let mut model = new_empty_model();
+
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_1DAY); // Very short term (1 day)
+    model._set("A3", BOND_MATURITY_4Y); // Standard term
+
+    // Edge case scenarios with explanations
+    let test_cases = [
+        ("B", "A1", "A2", STD_COUPON, STD_YIELD, "short_term"), // 1-day bond
+        ("C", "A1", "A3", 0.0, STD_YIELD, "zero_coupon"),       // Zero coupon bond
+        ("D", "A1", "A3", STD_COUPON, 0.0, "zero_yield"),       // Zero yield
+        ("E", "A1", "A3", 1.0, 0.5, "high_rates"),              // High coupon/yield (100%/50%)
+    ];
+
+    for (col, settlement, maturity, coupon, yield_rate, _scenario) in test_cases {
+        model._set(
+            &format!("{col}1"),
+            &format!("=DURATION({settlement},{maturity},{coupon},{yield_rate},{STD_FREQUENCY})"),
+        );
+        model._set(
+            &format!("{col}2"),
+            &format!("=MDURATION({settlement},{maturity},{coupon},{yield_rate},{STD_FREQUENCY})"),
+        );
+    }
+
+    model.evaluate();
+
+    // All edge cases should return positive values
+    for col in ["B", "C", "D", "E"] {
+        assert_numerical_result(&model, &format!("Sheet1!{col}1"), true);
+        assert_numerical_result(&model, &format!("Sheet1!{col}2"), true);
+    }
+}
+
+#[test]
+fn fn_duration_mduration_relationship() {
+    let mut model = new_empty_model();
+    model._set("A1", BOND_SETTLEMENT);
+    model._set("A2", BOND_MATURITY_4Y);
+
+    // Test mathematical relationship: MDURATION = DURATION / (1 + yield/frequency)
+    model._set(
+        "B1",
+        &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B2",
+        &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set("B3", &format!("=B1/(1+{STD_YIELD}/{STD_FREQUENCY})")); // Manual calculation
+
+    // Test with quarterly frequency and different yield
+    model._set("C1", &format!("=DURATION(A1,A2,{STD_COUPON},0.12,4)"));
+    model._set("C2", &format!("=MDURATION(A1,A2,{STD_COUPON},0.12,4)"));
+    model._set("C3", "=C1/(1+0.12/4)"); // Manual calculation for quarterly
+
+    model.evaluate();
+
+    // MDURATION should equal DURATION / (1 + yield/frequency) for both scenarios
+    if let (Ok(CellValue::Number(md)), Ok(CellValue::Number(manual))) = (
+        model.get_cell_value_by_ref("Sheet1!B2"),
+        model.get_cell_value_by_ref("Sheet1!B3"),
+    ) {
+        assert!(
+            (md - manual).abs() < 1e-10,
+            "MDURATION should equal DURATION/(1+yield/freq)"
+        );
+    }
+
+    if let (Ok(CellValue::Number(md)), Ok(CellValue::Number(manual))) = (
+        model.get_cell_value_by_ref("Sheet1!C2"),
+        model.get_cell_value_by_ref("Sheet1!C3"),
+    ) {
+        assert!(
+            (md - manual).abs() < 1e-10,
+            "MDURATION should equal DURATION/(1+yield/freq) for quarterly"
+        );
+    }
+}
+
+#[test]
+fn fn_duration_mduration_regression() {
+    // Original regression test with known expected values
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2016,1,1)");
+    model._set("A2", "=DATE(2020,1,1)");
+    model._set(
+        "B1",
+        &format!("=DURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+    model._set(
+        "B2",
+        &format!("=MDURATION(A1,A2,{STD_COUPON},{STD_YIELD},{STD_FREQUENCY})"),
+    );
+
+    model.evaluate();
+
+    // Verify exact values for regression testing
+    if let Ok(CellValue::Number(v1)) = model.get_cell_value_by_ref("Sheet1!B1") {
+        assert!(
+            (v1 - 3.410746844012284).abs() < 1e-9,
+            "DURATION regression test failed"
+        );
+    } else {
+        panic!("Unexpected value for DURATION");
+    }
+    if let Ok(CellValue::Number(v2)) = model.get_cell_value_by_ref("Sheet1!B2") {
+        assert!(
+            (v2 - 3.263872578002186).abs() < 1e-9,
+            "MDURATION regression test failed"
+        );
+    } else {
+        panic!("Unexpected value for MDURATION");
+    }
+}

base/src/test/test_fn_financial.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::unwrap_used)]
+#![allow(clippy::panic)]
 
 use crate::{cell::CellValue, test::util::new_empty_model};
 
@@ -25,6 +26,10 @@ fn fn_arguments() {
     model._set("E2", "=RATE(1,1)");
     model._set("E3", "=RATE(1,1,1,1,1,1)");
 
+    model._set("F1", "=FVSCHEDULE()");
+    model._set("F2", "=FVSCHEDULE(1)");
+    model._set("F3", "=FVSCHEDULE(1,1,1)");
+
     model.evaluate();
 
     assert_eq!(model._get_text("A1"), *"#ERROR!");
@@ -46,6 +51,10 @@ fn fn_arguments() {
     assert_eq!(model._get_text("E1"), *"#ERROR!");
     assert_eq!(model._get_text("E2"), *"#ERROR!");
     assert_eq!(model._get_text("E3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("F1"), *"#ERROR!");
+    assert_eq!(model._get_text("F2"), *"#ERROR!");
+    assert_eq!(model._get_text("F3"), *"#ERROR!");
 }
 
 #[test]
@@ -468,3 +477,18 @@ fn fn_db_misc() {
 
     assert_eq!(model._get_text("B1"), "$0.00");
 }
+
+#[test]
+fn fn_fvschedule() {
+    let mut model = new_empty_model();
+    model._set("A1", "1000");
+    model._set("A2", "0.08");
+    model._set("A3", "0.09");
+    model._set("A4", "0.1");
+
+    model._set("B1", "=FVSCHEDULE(A1, A2:A4)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "1294.92");
+}

base/src/test/test_fn_financial_bonds.rs

@@ -0,0 +1,615 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+#[test]
+fn fn_price_yield() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+    model._set("A3", "5%");
+
+    model._set("B1", "=PRICE(A1,A2,A3,6%,100,1)");
+    model._set("B2", "=YIELD(A1,A2,A3,B1,100,1)");
+
+    model.evaluate();
+    assert_eq!(model._get_text("B1"), "99.056603774");
+    assert_eq!(model._get_text("B2"), "0.06");
+}
+
+#[test]
+fn fn_price_frequencies() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=PRICE(A1,A2,5%,6%,100,1)");
+    model._set("B2", "=PRICE(A1,A2,5%,6%,100,2)");
+    model._set("B3", "=PRICE(A1,A2,5%,6%,100,4)");
+
+    model.evaluate();
+
+    let annual: f64 = model._get_text("B1").parse().unwrap();
+    let semi: f64 = model._get_text("B2").parse().unwrap();
+    let quarterly: f64 = model._get_text("B3").parse().unwrap();
+
+    assert_ne!(annual, semi);
+    assert_ne!(semi, quarterly);
+}
+
+#[test]
+fn fn_yield_frequencies() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=YIELD(A1,A2,5%,99,100,1)");
+    model._set("B2", "=YIELD(A1,A2,5%,99,100,2)");
+    model._set("B3", "=YIELD(A1,A2,5%,99,100,4)");
+
+    model.evaluate();
+
+    let annual: f64 = model._get_text("B1").parse().unwrap();
+    let semi: f64 = model._get_text("B2").parse().unwrap();
+    let quarterly: f64 = model._get_text("B3").parse().unwrap();
+
+    assert_ne!(annual, semi);
+    assert_ne!(semi, quarterly);
+}
+
+#[test]
+fn fn_price_argument_errors() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=PRICE()");
+    model._set("B2", "=PRICE(A1,A2,5%,6%,100)");
+    model._set("B3", "=PRICE(A1,A2,5%,6%,100,2,0,99)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+}
+
+#[test]
+fn fn_yield_argument_errors() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=YIELD()");
+    model._set("B2", "=YIELD(A1,A2,5%,99,100)");
+    model._set("B3", "=YIELD(A1,A2,5%,99,100,2,0,99)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+}
+
+#[test]
+fn fn_price_invalid_frequency() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=PRICE(A1,A2,5%,6%,100,0)");
+    model._set("B2", "=PRICE(A1,A2,5%,6%,100,3)");
+    model._set("B3", "=PRICE(A1,A2,5%,6%,100,5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("B3"), *"#NUM!");
+}
+
+#[test]
+fn fn_pricedisc() {
+    let mut model = new_empty_model();
+    model._set("A2", "=DATE(2022,1,25)");
+    model._set("A3", "=DATE(2022,11,15)");
+    model._set("A4", "3.75%");
+    model._set("A5", "100");
+
+    model._set("B1", "=PRICEDISC(A2,A3,A4,A5)");
+    model._set("C1", "=PRICEDISC(A2,A3)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "96.979166667");
+    assert_eq!(model._get_text("C1"), *"#ERROR!");
+}
+
+#[test]
+fn fn_pricemat() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2019,2,15)");
+    model._set("A2", "=DATE(2025,4,13)");
+    model._set("A3", "=DATE(2018,11,11)");
+    model._set("A4", "5.75%");
+    model._set("A5", "6.5%");
+
+    model._set("B1", "=PRICEMAT(A1,A2,A3,A4,A5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "96.271187821");
+}
+
+#[test]
+fn fn_yielddisc() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2022,1,25)");
+    model._set("A2", "=DATE(2022,11,15)");
+    model._set("A3", "97");
+    model._set("A4", "100");
+
+    model._set("B1", "=YIELDDISC(A1,A2,A3,A4)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "0.038393175");
+}
+
+#[test]
+fn fn_yieldmat() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2019,2,15)");
+    model._set("A2", "=DATE(2025,4,13)");
+    model._set("A3", "=DATE(2018,11,11)");
+    model._set("A4", "5.75%");
+    model._set("A5", "96.27");
+
+    model._set("B1", "=YIELDMAT(A1,A2,A3,A4,A5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "0.065002762");
+}
+
+#[test]
+fn fn_disc() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2022,1,25)");
+    model._set("A2", "=DATE(2022,11,15)");
+    model._set("A3", "97");
+    model._set("A4", "100");
+
+    model._set("B1", "=DISC(A1,A2,A3,A4)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "0.037241379");
+}
+
+#[test]
+fn fn_received() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2023,6,30)");
+    model._set("A3", "20000");
+    model._set("A4", "5%");
+    model._set("A5", "3");
+
+    model._set("B1", "=RECEIVED(A1,A2,A3,A4,A5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "24236.387782205");
+}
+
+#[test]
+fn fn_intrate() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2020,1,1)");
+    model._set("A2", "=DATE(2023,6,30)");
+    model._set("A3", "10000");
+    model._set("A4", "12000");
+    model._set("A5", "3");
+
+    model._set("B1", "=INTRATE(A1,A2,A3,A4,A5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "0.057210031");
+}
+
+#[test]
+fn fn_bond_functions_arguments() {
+    let mut model = new_empty_model();
+
+    // PRICEDISC: 4-5 args
+    model._set("A1", "=PRICEDISC()");
+    model._set("A2", "=PRICEDISC(1,2,3)");
+    model._set("A3", "=PRICEDISC(1,2,3,4,5,6)");
+
+    // PRICEMAT: 5-6 args
+    model._set("B1", "=PRICEMAT()");
+    model._set("B2", "=PRICEMAT(1,2,3,4)");
+    model._set("B3", "=PRICEMAT(1,2,3,4,5,6,7)");
+
+    // YIELDDISC: 4-5 args
+    model._set("C1", "=YIELDDISC()");
+    model._set("C2", "=YIELDDISC(1,2,3)");
+    model._set("C3", "=YIELDDISC(1,2,3,4,5,6)");
+
+    // YIELDMAT: 5-6 args
+    model._set("D1", "=YIELDMAT()");
+    model._set("D2", "=YIELDMAT(1,2,3,4)");
+    model._set("D3", "=YIELDMAT(1,2,3,4,5,6,7)");
+
+    // DISC: 4-5 args
+    model._set("E1", "=DISC()");
+    model._set("E2", "=DISC(1,2,3)");
+    model._set("E3", "=DISC(1,2,3,4,5,6)");
+
+    // RECEIVED: 4-5 args
+    model._set("F1", "=RECEIVED()");
+    model._set("F2", "=RECEIVED(1,2,3)");
+    model._set("F3", "=RECEIVED(1,2,3,4,5,6)");
+
+    // INTRATE: 4-5 args
+    model._set("G1", "=INTRATE()");
+    model._set("G2", "=INTRATE(1,2,3)");
+    model._set("G3", "=INTRATE(1,2,3,4,5,6)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
+    assert_eq!(model._get_text("A2"), *"#ERROR!");
+    assert_eq!(model._get_text("A3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("B1"), *"#ERROR!");
+    assert_eq!(model._get_text("B2"), *"#ERROR!");
+    assert_eq!(model._get_text("B3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("C1"), *"#ERROR!");
+    assert_eq!(model._get_text("C2"), *"#ERROR!");
+    assert_eq!(model._get_text("C3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("D1"), *"#ERROR!");
+    assert_eq!(model._get_text("D2"), *"#ERROR!");
+    assert_eq!(model._get_text("D3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("E1"), *"#ERROR!");
+    assert_eq!(model._get_text("E2"), *"#ERROR!");
+    assert_eq!(model._get_text("E3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("F1"), *"#ERROR!");
+    assert_eq!(model._get_text("F2"), *"#ERROR!");
+    assert_eq!(model._get_text("F3"), *"#ERROR!");
+
+    assert_eq!(model._get_text("G1"), *"#ERROR!");
+    assert_eq!(model._get_text("G2"), *"#ERROR!");
+    assert_eq!(model._get_text("G3"), *"#ERROR!");
+}
+
+#[test]
+fn fn_bond_functions_date_boundaries() {
+    let mut model = new_empty_model();
+
+    // Date boundary values
+    model._set("A1", "0"); // Below MINIMUM_DATE_SERIAL_NUMBER
+    model._set("A2", "1"); // MINIMUM_DATE_SERIAL_NUMBER
+    model._set("A3", "2958465"); // MAXIMUM_DATE_SERIAL_NUMBER
+    model._set("A4", "2958466"); // Above MAXIMUM_DATE_SERIAL_NUMBER
+
+    // Test settlement < minimum
+    model._set("B1", "=PRICEDISC(A1,A2,0.05,100)");
+    model._set("B2", "=YIELDDISC(A1,A2,95,100)");
+    model._set("B3", "=DISC(A1,A2,95,100)");
+    model._set("B4", "=RECEIVED(A1,A2,1000,0.05)");
+    model._set("B5", "=INTRATE(A1,A2,1000,1050)");
+
+    // Test maturity > maximum
+    model._set("C1", "=PRICEDISC(A2,A4,0.05,100)");
+    model._set("C2", "=YIELDDISC(A2,A4,95,100)");
+    model._set("C3", "=DISC(A2,A4,95,100)");
+    model._set("C4", "=RECEIVED(A2,A4,1000,0.05)");
+    model._set("C5", "=INTRATE(A2,A4,1000,1050)");
+
+    // Test PRICEMAT/YIELDMAT with issue < minimum
+    model._set("D1", "=PRICEMAT(A2,A3,A1,0.06,0.05)");
+    model._set("D2", "=YIELDMAT(A2,A3,A1,0.06,99)");
+
+    // Test PRICEMAT/YIELDMAT with issue > maximum
+    model._set("E1", "=PRICEMAT(A2,A3,A4,0.06,0.05)");
+    model._set("E2", "=YIELDMAT(A2,A3,A4,0.06,99)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("B3"), *"#NUM!");
+}
+
+#[test]
+fn fn_yield_invalid_frequency() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=YIELD(A1,A2,5%,99,100,0)");
+    model._set("B2", "=YIELD(A1,A2,5%,99,100,3)");
+    model._set("B3", "=YIELD(A1,A2,5%,99,100,5)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("B3"), *"#NUM!");
+}
+
+#[test]
+fn fn_bond_functions_date_ordering() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2022,1,1)"); // settlement
+    model._set("A2", "=DATE(2021,12,31)"); // maturity (before settlement)
+    model._set("A3", "=DATE(2020,1,1)"); // issue
+
+    // Test settlement >= maturity
+    model._set("B1", "=PRICEDISC(A1,A2,0.05,100)");
+    model._set("B2", "=YIELDDISC(A1,A2,95,100)");
+    model._set("B3", "=DISC(A1,A2,95,100)");
+    model._set("B4", "=RECEIVED(A1,A2,1000,0.05)");
+    model._set("B5", "=INTRATE(A1,A2,1000,1050)");
+    model._set("B6", "=PRICEMAT(A1,A2,A3,0.06,0.05)");
+    model._set("B7", "=YIELDMAT(A1,A2,A3,0.06,99)");
+
+    // Test settlement < issue for YIELDMAT/PRICEMAT
+    model._set("A4", "=DATE(2023,1,1)"); // later issue date
+    model._set("C1", "=PRICEMAT(A1,A2,A4,0.06,0.05)"); // settlement < issue
+    model._set("C2", "=YIELDMAT(A1,A2,A4,0.06,99)"); // settlement < issue
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+    assert_eq!(model._get_text("B3"), *"#NUM!");
+}
+
+#[test]
+fn fn_price_invalid_dates() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=PRICE(A2,A1,5%,6%,100,2)");
+    model._set("B2", "=PRICE(A1,A1,5%,6%,100,2)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+}
+
+#[test]
+fn fn_bond_functions_parameter_validation() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2022,1,1)");
+    model._set("A2", "=DATE(2022,12,31)");
+    model._set("A3", "=DATE(2021,1,1)");
+
+    // Test negative/zero prices and redemptions
+    model._set("B1", "=PRICEDISC(A1,A2,0.05,0)"); // zero redemption
+    model._set("B2", "=PRICEDISC(A1,A2,0,100)"); // zero discount
+    model._set("B3", "=PRICEDISC(A1,A2,-0.05,100)"); // negative discount
+
+    model._set("C1", "=YIELDDISC(A1,A2,0,100)"); // zero price
+    model._set("C2", "=YIELDDISC(A1,A2,95,0)"); // zero redemption
+    model._set("C3", "=YIELDDISC(A1,A2,-95,100)"); // negative price
+
+    model._set("D1", "=DISC(A1,A2,0,100)"); // zero price
+    model._set("D2", "=DISC(A1,A2,95,0)"); // zero redemption
+    model._set("D3", "=DISC(A1,A2,-95,100)"); // negative price
+
+    model._set("E1", "=RECEIVED(A1,A2,0,0.05)"); // zero investment
+    model._set("E2", "=RECEIVED(A1,A2,1000,0)"); // zero discount
+    model._set("E3", "=RECEIVED(A1,A2,-1000,0.05)"); // negative investment
+
+    model._set("F1", "=INTRATE(A1,A2,0,1050)"); // zero investment
+    model._set("F2", "=INTRATE(A1,A2,1000,0)"); // zero redemption
+    model._set("F3", "=INTRATE(A1,A2,-1000,1050)"); // negative investment
+
+    model._set("G1", "=PRICEMAT(A1,A2,A3,-0.06,0.05)"); // negative rate
+    model._set("G2", "=PRICEMAT(A1,A2,A3,0.06,-0.05)"); // negative yield
+
+    model._set("H1", "=YIELDMAT(A1,A2,A3,0.06,0)"); // zero price
+    model._set("H2", "=YIELDMAT(A1,A2,A3,-0.06,99)"); // negative rate
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+}
+
+#[test]
+fn fn_yield_invalid_dates() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=YIELD(A2,A1,5%,99,100,2)");
+    model._set("B2", "=YIELD(A1,A1,5%,99,100,2)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"#NUM!");
+    assert_eq!(model._get_text("B2"), *"#NUM!");
+}
+
+#[test]
+fn fn_price_with_basis() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=PRICE(A1,A2,5%,6%,100,2,0)");
+    model._set("B2", "=PRICE(A1,A2,5%,6%,100,2,1)");
+
+    model.evaluate();
+
+    assert!(model._get_text("B1").parse::<f64>().is_ok());
+    assert!(model._get_text("B2").parse::<f64>().is_ok());
+}
+
+#[test]
+fn fn_yield_with_basis() {
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2023,1,1)");
+    model._set("A2", "=DATE(2024,1,1)");
+
+    model._set("B1", "=YIELD(A1,A2,5%,99,100,2,0)");
+    model._set("B2", "=YIELD(A1,A2,5%,99,100,2,1)");
+
+    model.evaluate();
+
+    assert!(model._get_text("B1").parse::<f64>().is_ok());
+    assert!(model._get_text("B2").parse::<f64>().is_ok());
+}
+
+#[test]
+fn fn_price_yield_inverse_functions() {
+    // Verifies PRICE and YIELD are mathematical inverses
+    // Regression test for periods calculation type mismatch
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2023,1,15)");
+    model._set("A2", "=DATE(2024,7,15)"); // ~1.5 years, fractional periods
+    model._set("A3", "4.75%"); // coupon
+    model._set("A4", "5.125%"); // yield
+
+    model._set("B1", "=PRICE(A1,A2,A3,A4,100,2)");
+    model._set("B2", "=YIELD(A1,A2,A3,B1,100,2)");
+
+    model.evaluate();
+
+    let calculated_yield: f64 = model._get_text("B2").parse().unwrap();
+    let expected_yield = 0.05125;
+
+    assert!(
+        (calculated_yield - expected_yield).abs() < 1e-12,
+        "YIELD should recover original yield: expected {expected_yield}, got {calculated_yield}"
+    );
+}
+
+#[test]
+fn fn_price_yield_round_trip_stability() {
+    // Tests numerical stability through multiple PRICE->YIELD->PRICE cycles
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2023,3,10)");
+    model._set("A2", "=DATE(2024,11,22)"); // Irregular period length
+    model._set("A3", "3.25%"); // coupon rate
+    model._set("A4", "4.875%"); // initial yield
+
+    // First round-trip
+    model._set("B1", "=PRICE(A1,A2,A3,A4,100,4)");
+    model._set("B2", "=YIELD(A1,A2,A3,B1,100,4)");
+
+    // Second round-trip
+    model._set("B3", "=PRICE(A1,A2,A3,B2,100,4)");
+
+    model.evaluate();
+
+    let price1: f64 = model._get_text("B1").parse().unwrap();
+    let price2: f64 = model._get_text("B3").parse().unwrap();
+
+    assert!(
+        (price1 - price2).abs() < 1e-10,
+        "Round-trip should be stable: {price1} vs {price2}"
+    );
+}
+
+#[test]
+fn fn_bond_functions_basis_validation() {
+    let mut model = new_empty_model();
+
+    model._set("A1", "=DATE(2022,1,1)");
+    model._set("A2", "=DATE(2022,12,31)");
+    model._set("A3", "=DATE(2021,1,1)");
+
+    // Test valid basis values (0-4)
+    model._set("B1", "=PRICEDISC(A1,A2,0.05,100,0)");
+    model._set("B2", "=PRICEDISC(A1,A2,0.05,100,1)");
+    model._set("B3", "=PRICEDISC(A1,A2,0.05,100,2)");
+    model._set("B4", "=PRICEDISC(A1,A2,0.05,100,3)");
+    model._set("B5", "=PRICEDISC(A1,A2,0.05,100,4)");
+
+    // Test invalid basis values
+    model._set("C1", "=PRICEDISC(A1,A2,0.05,100,-1)");
+    model._set("C2", "=PRICEDISC(A1,A2,0.05,100,5)");
+    model._set("C3", "=YIELDDISC(A1,A2,95,100,10)");
+    model._set("C4", "=DISC(A1,A2,95,100,-5)");
+    model._set("C5", "=RECEIVED(A1,A2,1000,0.05,99)");
+    model._set("C6", "=INTRATE(A1,A2,1000,1050,-2)");
+    model._set("C7", "=PRICEMAT(A1,A2,A3,0.06,0.05,7)");
+    model._set("C8", "=YIELDMAT(A1,A2,A3,0.06,99,-3)");
+
+    model.evaluate();
+
+    // Valid basis should work
+    assert_ne!(model._get_text("B1"), *"#ERROR!");
+    assert_ne!(model._get_text("B2"), *"#ERROR!");
+    assert_ne!(model._get_text("B3"), *"#ERROR!");
+    assert_ne!(model._get_text("B4"), *"#ERROR!");
+    assert_ne!(model._get_text("B5"), *"#ERROR!");
+
+    // Invalid basis should error
+    assert_eq!(model._get_text("C1"), *"#NUM!");
+    assert_eq!(model._get_text("C2"), *"#NUM!");
+    assert_eq!(model._get_text("C3"), *"#NUM!");
+    assert_eq!(model._get_text("C4"), *"#NUM!");
+    assert_eq!(model._get_text("C5"), *"#NUM!");
+    assert_eq!(model._get_text("C6"), *"#NUM!");
+    assert_eq!(model._get_text("C7"), *"#NUM!");
+    assert_eq!(model._get_text("C8"), *"#NUM!");
+}
+
+#[test]
+fn fn_bond_functions_relationships() {
+    // Test mathematical relationships between functions
+    let mut model = new_empty_model();
+    model._set("A1", "=DATE(2021,1,1)");
+    model._set("A2", "=DATE(2021,7,1)");
+
+    model._set("B1", "=PRICEDISC(A1,A2,5%,100)");
+    model._set("B2", "=YIELDDISC(A1,A2,B1,100)");
+    model._set("B3", "=DISC(A1,A2,B1,100)");
+    model._set("B4", "=RECEIVED(A1,A2,1000,5%)");
+    model._set("B5", "=INTRATE(A1,A2,1000,1050)");
+    model._set("B6", "=PRICEMAT(A1,A2,DATE(2020,7,1),6%,5%)");
+    model._set("B7", "=YIELDMAT(A1,A2,DATE(2020,7,1),6%,99)");
+
+    model.evaluate();
+
+    assert_eq!(
+        model.get_cell_value_by_ref("Sheet1!B1"),
+        Ok(CellValue::Number(97.5))
+    );
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B2") {
+        assert!((v - 0.051282051).abs() < 1e-6);
+    }
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B3") {
+        assert!((v - 0.05).abs() < 1e-6);
+    }
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B4") {
+        assert!((v - 1025.641025).abs() < 1e-6);
+    }
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B5") {
+        assert!((v - 0.10).abs() < 1e-6);
+    }
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B6") {
+        assert!((v - 100.414634).abs() < 1e-6);
+    }
+    if let Ok(CellValue::Number(v)) = model.get_cell_value_by_ref("Sheet1!B7") {
+        assert!((v - 0.078431372).abs() < 1e-6);
+    }
+}

base/src/test/test_fn_fvschedule.rs

@@ -0,0 +1,127 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::{cell::CellValue, test::util::new_empty_model};
+
+#[test]
+fn computation() {
+    let mut model = new_empty_model();
+    model._set("B1", "0.1");
+    model._set("B2", "0.2");
+    model._set("A1", "=FVSCHEDULE(100,B1:B2)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), "132");
+}
+
+#[test]
+fn fvschedule_basic_with_precise_assertion() {
+    let mut model = new_empty_model();
+    model._set("A1", "1000");
+    model._set("B1", "0.09");
+    model._set("B2", "0.11");
+    model._set("B3", "0.1");
+
+    model._set("C1", "=FVSCHEDULE(A1,B1:B3)");
+    model.evaluate();
+
+    assert_eq!(
+        model.get_cell_value_by_ref("Sheet1!C1"),
+        Ok(CellValue::Number(1330.89))
+    );
+}
+
+#[test]
+fn fvschedule_compound_rates() {
+    let mut model = new_empty_model();
+    model._set("A1", "1");
+    model._set("A2", "0.1");
+    model._set("A3", "0.2");
+    model._set("A4", "0.3");
+
+    model._set("B1", "=FVSCHEDULE(A1, A2:A4)");
+
+    model.evaluate();
+
+    // 1 * (1+0.1) * (1+0.2) * (1+0.3) = 1 * 1.1 * 1.2 * 1.3 = 1.716
+    assert_eq!(model._get_text("B1"), "1.716");
+}
+
+#[test]
+fn fvschedule_ignore_non_numbers() {
+    let mut model = new_empty_model();
+    model._set("A1", "1");
+    model._set("A2", "0.1");
+    model._set("A3", "foo"); // non-numeric value should be ignored
+    model._set("A4", "0.2");
+
+    model._set("B1", "=FVSCHEDULE(A1, A2:A4)");
+
+    model.evaluate();
+
+    // 1 * (1+0.1) * (1+0.2) = 1 * 1.1 * 1.2 = 1.32
+    assert_eq!(model._get_text("B1"), "1.32");
+}
+
+#[test]
+fn fvschedule_argument_count() {
+    let mut model = new_empty_model();
+    model._set("A1", "=FVSCHEDULE()");
+    model._set("A2", "=FVSCHEDULE(1)");
+    model._set("A3", "=FVSCHEDULE(1,1,1)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
+    assert_eq!(model._get_text("A2"), *"#ERROR!");
+    assert_eq!(model._get_text("A3"), *"#ERROR!");
+}
+
+#[test]
+fn fvschedule_edge_cases() {
+    let mut model = new_empty_model();
+
+    // Test with zero principal
+    model._set("A1", "0");
+    model._set("A2", "0.1");
+    model._set("A3", "0.2");
+    model._set("B1", "=FVSCHEDULE(A1, A2:A3)");
+
+    // Test with negative principal
+    model._set("C1", "-100");
+    model._set("D1", "=FVSCHEDULE(C1, A2:A3)");
+
+    // Test with zero rates
+    model._set("E1", "100");
+    model._set("E2", "0");
+    model._set("E3", "0");
+    model._set("F1", "=FVSCHEDULE(E1, E2:E3)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "0"); // 0 * anything = 0
+    assert_eq!(model._get_text("D1"), "-132"); // -100 * 1.1 * 1.2 = -132
+    assert_eq!(model._get_text("F1"), "100"); // 100 * 1 * 1 = 100
+}
+
+#[test]
+fn fvschedule_rate_validation() {
+    let mut model = new_empty_model();
+
+    // Test with rate exactly -1 (should cause error due to validation in patch 1)
+    model._set("A1", "100");
+    model._set("A2", "-1");
+    model._set("A3", "0.1");
+    model._set("B1", "=FVSCHEDULE(A1, A2:A3)");
+
+    // Test with rate less than -1 (should cause error)
+    model._set("C1", "100");
+    model._set("C2", "-1.5");
+    model._set("C3", "0.1");
+    model._set("D1", "=FVSCHEDULE(C1, C2:C3)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), "#NUM!");
+    assert_eq!(model._get_text("D1"), "#NUM!");
+}

base/src/test/test_issue_483.rs

@@ -0,0 +1,13 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn issue_155() {
+    let mut model = new_empty_model();
+    model._set("A1", "123");
+    model._set("D2", "=-(A1^1.22)");
+    model.evaluate();
+
+    assert_eq!(model._get_formula("D2"), "=-(A1^1.22)".to_string());
+}

base/src/test/test_sheet_names.rs

@@ -0,0 +1,16 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn sheet_number_name() {
+    let mut model = new_empty_model();
+    model.new_sheet();
+    model._set("A1", "7");
+    model._set("A2", "=Sheet2!C3");
+    model.evaluate();
+    model.rename_sheet("Sheet2", "2024").unwrap();
+    model.evaluate();
+    assert_eq!(model.workbook.get_worksheet_names(), ["Sheet1", "2024"]);
+    assert_eq!(model._get_text("A2"), "0");
+}

bindings/wasm/src/lib.rs

@@ -5,7 +5,11 @@ use wasm_bindgen::{
 };
 
 use ironcalc_base::{
-    expressions::{lexer::util::get_tokens as tokenizer, types::Area, utils::number_to_column},
+    expressions::{
+        lexer::util::get_tokens as tokenizer,
+        types::Area,
+        utils::{number_to_column, quote_name as quote_name_ic},
+    },
     types::{CellType, Style},
     worksheet::NavigationDirection,
     BorderArea, ClipboardData, UserModel as BaseModel,
@@ -31,6 +35,11 @@ pub fn column_name_from_number(column: i32) -> Result<String, JsError> {
     }
 }
 
+#[wasm_bindgen(js_name = "quoteName")]
+pub fn quote_name(name: &str) -> String {
+    quote_name_ic(name)
+}
+
 #[derive(Serialize)]
 struct DefinedName {
     name: String,

docker-compose.yml

@@ -1,10 +1,12 @@
 services:
   server:
+    image: ghcr.io/ironcalc/ironcalc-server:0.6.0
     build:
       context: .
       target: server-runtime
 
   caddy:
+    image: ghcr.io/ironcalc/ironcalc-caddy:0.6.0
     build:
       context: .
       target: caddy-runtime

docs/package.json

@@ -6,7 +6,7 @@
   },
   "devDependencies": {
     "markdown-it-mathjax3": "^4.3.2",
-    "vitepress": "^v2.0.0-alpha.8",
+    "vitepress": "^v2.0.0-alpha.12",
     "vue": "^3.5.17"
   }
 }

docs/src/features/value-types.md

@@ -68,6 +68,8 @@ Using IronCalc, a complex number is a string of the form "1+j3".
 
 ## Arrays
 
+## Ranges
+
 ## References
 
 A reference is a pointer to a single cell or a range of cells. The reference can either be entered manually, for example "A4", or as the result of a calculation, such as the OFFSET Function or the INDIRECT Function. A reference can also be built, for example with the Colon (\:) Operator. 

docs/src/functions/date-and-time.md

@@ -6,29 +6,28 @@ lang: en-US
 
 # Date and Time functions
 
-At the moment IronCalc only supports a few function in this section.  
+All Date and Time functions are already supported in IronCalc.
-You can track the progress in this [GitHub issue](https://github.com/ironcalc/IronCalc/issues/48).
 
 | Function         | Status                                         | Documentation |
 | ---------------- | ---------------------------------------------- | ------------- |
 | DATE             | <Badge type="tip" text="Available" />          | –             |
-| DATEDIF          | <Badge type="tip" text="Available" />          | [DATEDIF](date_and_time/datedif) |
+| DATEDIF          | <Badge type="tip" text="Available" />          | –             |
-| DATEVALUE        | <Badge type="tip" text="Available" />          | [DATEVALUE](date_and_time/datevalue) |
+| DATEVALUE        | <Badge type="tip" text="Available" />          | –             |
 | DAY              | <Badge type="tip" text="Available" />          | [DAY](date_and_time/day) |
 | DAYS             | <Badge type="tip" text="Available" />          | –             |
 | DAYS360          | <Badge type="tip" text="Available" />          | –             |
 | EDATE            | <Badge type="tip" text="Available" />          | –             |
 | EOMONTH          | <Badge type="tip" text="Available" />          | –             |
-| HOUR             | <Badge type="tip" text="Available" />          | [HOUR](date_and_time/hour) |
+| HOUR             | <Badge type="tip" text="Available" />          | –             |
 | ISOWEEKNUM       | <Badge type="tip" text="Available" />          | –             |
-| MINUTE           | <Badge type="tip" text="Available" />          | [MINUTE](date_and_time/minute) |
+| MINUTE           | <Badge type="tip" text="Available" />          | –             |
 | MONTH            | <Badge type="tip" text="Available" />          | [MONTH](date_and_time/month) |
 | NETWORKDAYS      | <Badge type="tip" text="Available" />          | [NETWORKDAYS](date_and_time/networkdays) |
 | NETWORKDAYS.INTL | <Badge type="tip" text="Available" />          | [NETWORKDAYS.INTL](date_and_time/networkdays.intl) |
 | NOW              | <Badge type="tip" text="Available" />          | –             |
-| SECOND           | <Badge type="tip" text="Available" />          | [SECOND](date_and_time/second) |
+| SECOND           | <Badge type="tip" text="Available" />          | –             |
-| TIME             | <Badge type="tip" text="Available" />          | [TIME](date_and_time/time) |
+| TIME             | <Badge type="tip" text="Available" />          | –             |
-| TIMEVALUE        | <Badge type="tip" text="Available" />          | [TIMEVALUE](date_and_time/timevalue) |
+| TIMEVALUE        | <Badge type="tip" text="Available" />          | –             |
 | TODAY            | <Badge type="tip" text="Available" />          | –             |
 | WEEKDAY          | <Badge type="tip" text="Available" />          | –             |
 | WEEKNUM          | <Badge type="tip" text="Available" />          | –             |

docs/src/functions/date_and_time/networkdays.intl.md

@@ -22,7 +22,7 @@ NETWORKDAYS.INTL is a function of the Date and Time category that calculates the
 * *start_date* ([number](/features/value-types#numbers), required). The start date expressed as a [serial number](/features/serial-numbers.md).
 * *end_date* ([number](/features/value-types#numbers), required). The end date expressed as a [serial number](/features/serial-numbers.md).
 * *weekend* ([number](/features/value-types#numbers) or [string](/features/value-types#strings), optional). Defines which days are considered weekends. Default is 1 (Saturday-Sunday).
-* *holidays* ([array](/features/value-types#arrays) or [range](/features/ranges), optional). A list of dates to exclude from the calculation, expressed as serial numbers.
+* *holidays* ([array](/features/value-types#arrays) or [range](/features/value-types#ranges), optional). A list of dates to exclude from the calculation, expressed as serial numbers.
 
 ### Weekend parameter options
 The _weekend_ parameter can be specified in two ways:

docs/src/functions/date_and_time/networkdays.md

@@ -21,7 +21,7 @@ NETWORKDAYS is a function of the Date and Time category that calculates the numb
 ### Argument descriptions
 * *start_date* ([number](/features/value-types#numbers), required). The start date expressed as a [serial number](/features/serial-numbers.md).
 * *end_date* ([number](/features/value-types#numbers), required). The end date expressed as a [serial number](/features/serial-numbers.md).
-* *holidays* ([array](/features/value-types#arrays) or [range](/features/ranges), optional). A list of dates to exclude from the calculation, expressed as serial numbers.
+* *holidays* ([array](/features/value-types#arrays) or [range](/features/value-types#ranges), optional). A list of dates to exclude from the calculation, expressed as serial numbers.
 
 ### Additional guidance
 - If the supplied _start_date_ and _end_date_ arguments have fractional parts, NETWORKDAYS uses their [floor values](https://en.wikipedia.org/wiki/Floor_and_ceiling_functions).

docs/src/functions/financial.md

@@ -11,32 +11,32 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 
 | Function   | Status                                         | Documentation      |
 | ---------- | ---------------------------------------------- | ------------------ |
-| ACCRINT    | <Badge type="info" text="Not implemented yet" /> | –                  |
+| ACCRINT    | <Badge type="tip" text="Available" />          | [ACCRINT](financial/accrint) |
-| ACCRINTM   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| ACCRINTM   | <Badge type="tip" text="Available" />          | [ACCRINTM](financial/accrintm) |
 | AMORDEGRC  | <Badge type="info" text="Not implemented yet" /> | –                  |
 | AMORLINC   | <Badge type="info" text="Not implemented yet" /> | –                  |
-| COUPDAYBS  | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPDAYBS  | <Badge type="tip" text="Available" /> | –                  |
-| COUPDAYS   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPDAYS   | <Badge type="tip" text="Available" /> | –                  |
-| COUPDAYSNC | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPDAYSNC | <Badge type="tip" text="Available" /> | –                  |
-| COUPNCD    | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPNCD    | <Badge type="tip" text="Available" /> | –                  |
-| COUPNUM    | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPNUM    | <Badge type="tip" text="Available" /> | –                  |
-| COUPPCD    | <Badge type="info" text="Not implemented yet" /> | –                  |
+| COUPPCD    | <Badge type="tip" text="Available" /> | –                  |
 | CUMIPMT    | <Badge type="tip" text="Available" />          | –                  |
 | CUMPRINC   | <Badge type="tip" text="Available" />          | –                  |
 | DB         | <Badge type="tip" text="Available" />          | –                  |
 | DDB        | <Badge type="tip" text="Available" />          | –                  |
-| DISC       | <Badge type="info" text="Not implemented yet" /> | –                  |
+| DISC       | <Badge type="tip" text="Available" />          | –                  |
 | DOLLARDE   | <Badge type="tip" text="Available" />          | –                  |
 | DOLLARFR   | <Badge type="tip" text="Available" />          | –                  |
-| DURATION   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| DURATION   | <Badge type="tip" text="Available" />          | –                  |
 | EFFECT     | <Badge type="tip" text="Available" />          | –                  |
 | FV         | <Badge type="tip" text="Available" />          | [FV](financial/fv) |
-| FVSCHEDULE | <Badge type="info" text="Not implemented yet" /> | –                  |
+| FVSCHEDULE | <Badge type="tip" text="Available" /> | [FVSCHEDULE](financial/fvschedule) |
-| INTRATE    | <Badge type="info" text="Not implemented yet" /> | –                  |
+| INTRATE    | <Badge type="tip" text="Available" />          | –                  |
 | IPMT       | <Badge type="tip" text="Available" />          | –                  |
 | IRR        | <Badge type="tip" text="Available" />          | –                  |
 | ISPMT      | <Badge type="tip" text="Available" />          | –                  |
-| MDURATION  | <Badge type="info" text="Not implemented yet" /> | –                  |
+| MDURATION  | <Badge type="tip" text="Available" />          | –                  |
 | MIRR       | <Badge type="tip" text="Available" />          | –                  |
 | NOMINAL    | <Badge type="tip" text="Available" />          | –                  |
 | NPER       | <Badge type="tip" text="Available" />          | –                  |
@@ -48,12 +48,12 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | PDURATION  | <Badge type="tip" text="Available" />          | –                  |
 | PMT        | <Badge type="tip" text="Available" />          | –                  |
 | PPMT       | <Badge type="tip" text="Available" />          | –                  |
-| PRICE      | <Badge type="info" text="Not implemented yet" /> | –                  |
+| PRICE      | <Badge type="tip" text="Available" />          | –                  |
-| PRICEDISC  | <Badge type="info" text="Not implemented yet" /> | –                  |
+| PRICEDISC  | <Badge type="tip" text="Available" />          | –                  |
-| PRICEMAT   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| PRICEMAT   | <Badge type="tip" text="Available" />          | –                  |
 | PV         | <Badge type="tip" text="Available" />          | [PV](financial/pv) |
 | RATE       | <Badge type="tip" text="Available" />          | –                  |
-| RECEIVED   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| RECEIVED   | <Badge type="tip" text="Available" />          | –                  |
 | RRI        | <Badge type="tip" text="Available" />          | -                  |
 | SLN        | <Badge type="tip" text="Available" />          | –                  |
 | SYD        | <Badge type="tip" text="Available" />          | –                  |
@@ -63,6 +63,9 @@ You can track the progress in this [GitHub issue](https://github.com/ironcalc/Ir
 | VDB        | <Badge type="info" text="Not implemented yet" /> | –                  |
 | XIRR       | <Badge type="tip" text="Available" />          | –                  |
 | XNPV       | <Badge type="tip" text="Available" />          | –                  |
-| YIELD      | <Badge type="info" text="Not implemented yet" /> | –                  |
+| YIELD      | <Badge type="tip" text="Available" />          | –                  |
 | YIELDDISC  | <Badge type="info" text="Not implemented yet" /> | –                  |
 | YIELDMAT   | <Badge type="info" text="Not implemented yet" /> | –                  |
+| YIELD      | <Badge type="tip" text="Available" />          | –                  |
+| YIELDDISC  | <Badge type="tip" text="Available" />          | –                  |
+| YIELDMAT   | <Badge type="tip" text="Available" />          | –                  |

docs/src/functions/financial/accrint.md

@@ -7,6 +7,5 @@ lang: en-US
 # ACCRINT
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/accrintm.md

@@ -7,6 +7,5 @@ lang: en-US
 # ACCRINTM
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/coupdaybs.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPDAYBS
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/coupdays.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPDAYS
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/coupdaysnc.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPDAYSNC
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/coupncd.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPNCD
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/coupnum.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPNUM
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/couppcd.md

@@ -7,6 +7,5 @@ lang: en-US
 # COUPPCD
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/disc.md

@@ -7,6 +7,5 @@ lang: en-US
 # DISC
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/duration.md

@@ -7,6 +7,5 @@ lang: en-US
 # DURATION
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/fvschedule.md

@@ -7,6 +7,5 @@ lang: en-US
 # FVSCHEDULE
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/intrate.md

@@ -7,6 +7,5 @@ lang: en-US
 # INTRATE
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/mduration.md

@@ -7,6 +7,5 @@ lang: en-US
 # MDURATION
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/price.md

@@ -7,6 +7,5 @@ lang: en-US
 # PRICE
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/pricedisc.md

@@ -7,6 +7,5 @@ lang: en-US
 # PRICEDISC
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/pricemat.md

@@ -7,6 +7,5 @@ lang: en-US
 # PRICEMAT
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/received.md

@@ -7,6 +7,5 @@ lang: en-US
 # RECEIVED
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/yield.md

@@ -7,6 +7,5 @@ lang: en-US
 # YIELD
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/yielddisc.md

@@ -7,6 +7,5 @@ lang: en-US
 # YIELDDISC
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

docs/src/functions/financial/yieldmat.md

@@ -7,6 +7,5 @@ lang: en-US
 # YIELDMAT
 
 ::: warning
-🚧 This function is not yet available in IronCalc.
+🚧 This function is implemented but currently lacks detailed documentation. For guidance, you may refer to the equivalent functionality in [Microsoft Excel documentation](https://support.microsoft.com/en-us/office/excel-functions-by-category-5f91f4e9-7b42-46d2-9bd1-63f26a86c0eb).
-[Follow development here](https://github.com/ironcalc/IronCalc/labels/Functions)
 :::

webapp/IronCalc/package-lock.json

@@ -40,7 +40,7 @@
     },
     "../../bindings/wasm/pkg": {
       "name": "@ironcalc/wasm",
-      "version": "0.5.0",
+      "version": "0.6.0",
       "license": "MIT/Apache-2.0"
     },
     "node_modules/@adobe/css-tools": {

webapp/IronCalc/src/components/SheetTabBar/SheetTab.tsx

@@ -1,6 +1,12 @@
 import { Button, Menu, MenuItem, styled } from "@mui/material";
 import type { MenuItemProps } from "@mui/material";
-import { ChevronDown } from "lucide-react";
+import {
+  ChevronDown,
+  EyeOff,
+  PaintBucket,
+  TextCursorInput,
+  Trash2,
+} from "lucide-react";
 import { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { theme } from "../../theme";
@@ -98,7 +104,8 @@ function SheetTab(props: SheetTabProps) {
             handleClose();
           }}
         >
-          Rename
+          <TextCursorInput />
+          {t("sheet_tab.rename")}
         </StyledMenuItem>
         <StyledMenuItem
           onClick={() => {
@@ -106,16 +113,8 @@ function SheetTab(props: SheetTabProps) {
             handleClose();
           }}
         >
-          Change Color
+          <PaintBucket />
-        </StyledMenuItem>
+          {t("sheet_tab.change_color")}
-        <StyledMenuItem
-          disabled={!props.canDelete}
-          onClick={() => {
-            handleOpenDeleteDialog();
-            handleClose();
-          }}
-        >
-          Delete
         </StyledMenuItem>
         <StyledMenuItem
           disabled={!props.canDelete}
@@ -124,8 +123,20 @@ function SheetTab(props: SheetTabProps) {
             handleClose();
           }}
         >
-          Hide sheet
+          <EyeOff />
+          {t("sheet_tab.hide_sheet")}
         </StyledMenuItem>
+        <MenuDivider />
+        <DeleteButton
+          disabled={!props.canDelete}
+          onClick={() => {
+            handleOpenDeleteDialog();
+            handleClose();
+          }}
+        >
+          <Trash2 />
+          {t("sheet_tab.delete")}
+        </DeleteButton>
       </StyledMenu>
       <SheetRenameDialog
         open={renameDialogOpen}
@@ -178,7 +189,9 @@ const StyledMenu = styled(Menu)`
 
 const StyledMenuItem = styled(MenuItem)<MenuItemProps>(() => ({
   display: "flex",
-  justifyContent: "space-between",
+  justifyContent: "flex-start",
+  alignItems: "center",
+  gap: "8px",
   fontSize: "12px",
   width: "calc(100% - 8px)",
   margin: "0px 4px",
@@ -188,6 +201,11 @@ const StyledMenuItem = styled(MenuItem)<MenuItemProps>(() => ({
   "&:disabled": {
     color: "#BDBDBD",
   },
+  "& svg": {
+    width: "16px",
+    height: "16px",
+    color: `${theme.palette.grey[600]}`,
+  },
 }));
 
 const TabWrapper = styled("div")<{ $color: string; $selected: boolean }>`
@@ -233,4 +251,25 @@ const Name = styled("div")`
   user-select: none;
 `;
 
+const MenuDivider = styled("div")`
+  width: 100%;
+  margin: auto;
+  margin-top: 4px;
+  margin-bottom: 4px;
+  border-top: 1px solid ${theme.palette.grey[200]};
+`;
+
+const DeleteButton = styled(StyledMenuItem)`
+  color: ${theme.palette.error.main};
+  svg {
+    color: ${theme.palette.error.main};
+  }
+  &:hover {
+    background-color: ${theme.palette.error.main}1A;
+  }
+  &:active {
+    background-color: ${theme.palette.error.main}1A;
+  }
+`;
+
 export default SheetTab;

webapp/IronCalc/src/components/SheetTabBar/SheetTabBar.tsx

@@ -1,7 +1,9 @@
 import { styled } from "@mui/material";
+import { Tooltip } from "@mui/material";
 import { Menu, Plus } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { IronCalcLogo } from "../../icons";
 import { theme } from "../../theme";
 import { StyledButton } from "../Toolbar/Toolbar";
 import { NAVIGATION_HEIGHT } from "../constants";
@@ -49,20 +51,16 @@ function SheetTabBar(props: SheetTabBarProps) {
   return (
     <Container>
       <LeftButtonsContainer>
-        <StyledButton
+        <Tooltip title={t("navigation.add_sheet")}>
-          title={t("navigation.add_sheet")}
+          <StyledButton $pressed={false} onClick={props.onAddBlankSheet}>
-          $pressed={false}
+            <Plus />
-          onClick={props.onAddBlankSheet}
+          </StyledButton>
-        >
+        </Tooltip>
-          <Plus />
+        <Tooltip title={t("navigation.sheet_list")}>
-        </StyledButton>
+          <StyledButton onClick={handleClick} $pressed={false}>
-        <StyledButton
+            <Menu />
-          onClick={handleClick}
+          </StyledButton>
-          title={t("navigation.sheet_list")}
+        </Tooltip>
-          $pressed={false}
-        >
-          <Menu />
-        </StyledButton>
       </LeftButtonsContainer>
       <VerticalDivider />
       <Sheets>
@@ -90,9 +88,15 @@ function SheetTabBar(props: SheetTabBarProps) {
           ))}
         </SheetInner>
       </Sheets>
-      <Advert href="https://www.ironcalc.com" target="_blank">
+      <RightContainer>
-        ironcalc.com
+        <Tooltip title={t("navigation.link")}>
-      </Advert>
+          <LogoLink
+            onClick={() => window.open("https://www.ironcalc.com", "_blank")}
+          >
+            <IronCalcLogo />
+          </LogoLink>
+        </Tooltip>
+      </RightContainer>
       <SheetListMenu
         anchorEl={anchorEl}
         open={open}
@@ -119,14 +123,11 @@ const Container = styled("div")`
   display: flex;
   height: ${NAVIGATION_HEIGHT}px;
   align-items: center;
-  padding: 0px 12px;
+  padding: 0px;
   font-family: Inter;
+  overflow: hidden;
   background-color: ${theme.palette.common.white};
   border-top: 1px solid ${theme.palette.grey["300"]};
-  @media (max-width: 769px) {
-    padding-right: 0px;
-    padding-left: 8px;
-  }
 `;
 
 const Sheets = styled("div")`
@@ -143,30 +144,15 @@ const SheetInner = styled("div")`
   display: flex;
 `;
 
-const Advert = styled("a")`
-  display: flex;
-  align-items: center;
-  color: ${theme.palette.primary.main};
-  padding: 0px 0px 0px 12px;
-  font-size: 12px;
-  text-decoration: none;
-  border-left: 1px solid ${theme.palette.grey["300"]};
-  transition: color 0.2s ease-in-out;
-  &:hover {
-    text-decoration: underline;
-  }
-  @media (max-width: 769px) {
-    display: none;
-  }
-`;
-
 const LeftButtonsContainer = styled("div")`
   display: flex;
   flex-direction: row;
+  align-items: center;
+  height: 100%;
   gap: 4px;
-  padding-right: 12px;
+  padding: 0px 12px;
   @media (max-width: 769px) {
-    padding-right: 8px;
+    padding: 0px 8px;
   }
 `;
 
@@ -178,4 +164,29 @@ const VerticalDivider = styled("div")`
   }
 `;
 
+const RightContainer = styled("a")`
+  display: flex;
+  align-items: center;
+  color: ${theme.palette.primary.main};
+  height: 100%;
+  padding: 0px 8px;
+  @media (max-width: 769px) {
+    display: none;
+  }
+`;
+
+const LogoLink = styled("div")`
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-radius: 4px;
+  svg {
+    height: 14px;
+    width: auto;
+  }
+  &:hover {
+    background-color: ${theme.palette.grey["100"]};
+  }
+`;
+
 export default SheetTabBar;

webapp/IronCalc/src/components/util.ts

@@ -1,36 +1,12 @@
 import type { Area, Cell } from "./types";
 
-import { type SelectedView, columnNameFromNumber } from "@ironcalc/wasm";
+import {
+  type SelectedView,
+  columnNameFromNumber,
+  quoteName,
+} from "@ironcalc/wasm";
 import { LAST_COLUMN, LAST_ROW } from "./WorksheetCanvas/constants";
 
-// FIXME: Use the `quoteName` function from the wasm module
-function nameNeedsQuoting(name: string): boolean {
-  // it contains any of these characters: ()'$,;-+{} or space
-  for (const char of name) {
-    if (" ()'$,;-+{}".includes(char)) {
-      return true;
-    }
-  }
-
-  // TODO:
-  // - cell reference in A1 notation, e.g. B1048576 is quoted, B1048577 is not
-  // - cell reference in R1C1 notation, e.g. RC, RC2, R5C, R-4C, RC-8, R, C
-  // - integers
-
-  return false;
-}
-
-/**
- * Quotes a string sheet name if it needs to
- * NOTE: Invalid characters in a sheet name: \, /, *, [, ], :, ?
- */
-export function quoteName(name: string): string {
-  if (nameNeedsQuoting(name)) {
-    return `'${name.replace(/'/g, "''")}'`;
-  }
-  return name;
-}
-
 /**
  *  Returns true if the keypress should start editing
  */

webapp/IronCalc/src/locale/en_us.json

@@ -81,6 +81,12 @@
     "confirm": "Yes, delete sheet",
     "cancel": "Cancel"
   },
+  "sheet_tab": {
+    "rename": "Rename",
+    "change_color": "Change Color",
+    "delete": "Delete",
+    "hide_sheet": "Hide sheet"
+  },
   "formula_input": {
     "update": "Update",
     "label": "Formula",
@@ -88,7 +94,8 @@
   },
   "navigation": {
     "add_sheet": "Add sheet",
-    "sheet_list": "Sheet list"
+    "sheet_list": "Sheet list",
+    "link": "Open ironcalc.com"
   },
   "name_manager_dialog": {
     "title": "Named Ranges",

webapp/app.ironcalc.com/frontend/index.html

@@ -2,7 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/ironcalc.svg" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico?v=1" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=1" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=1" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=1" />
+    <link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png?v=1" />
+    <link rel="icon" type="image/png" sizes="512x512" href="/android-chrome-512x512.png?v=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <!-- <meta name="theme-color" content="#1bb566"> -->
     <meta name="theme-color" media="(prefers-color-scheme: light)" content="#F2994A" />

webapp/app.ironcalc.com/frontend/src/App.tsx

@@ -75,6 +75,16 @@ function App() {
     start();
   }, []);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: localStorageId needed to detect name changes (model mutates internally)
+  useEffect(() => {
+    if (model) {
+      const workbookName = model.getName();
+      document.title = workbookName ? `${workbookName} - IronCalc` : "IronCalc";
+    } else {
+      document.title = "IronCalc";
+    }
+  }, [model, localStorageId]);
+
   if (!model) {
     return (
       <Loading>

webapp/app.ironcalc.com/frontend/src/components/storage.ts

@@ -8,6 +8,19 @@ type ModelsMetadata = Record<
   { name: string; createdAt: number; pinned?: boolean }
 >;
 
+function randomUUID(): string {
+  try {
+    return crypto.randomUUID();
+  } catch {
+    // Fallback for environments without crypto.randomUUID()
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+      const r = (Math.random() * 16) | 0;
+      const v = c === "x" ? r : (r & 0x3) | 0x8;
+      return v.toString(16);
+    });
+  }
+}
+
 export function updateNameSelectedWorkbook(model: Model, newName: string) {
   const uuid = localStorage.getItem("selected");
   if (uuid) {
@@ -77,7 +90,7 @@ export function createNewModel(): Model {
   const name = getNewName(Object.values(models).map((m) => m.name));
 
   const model = new Model(name, "en", "UTC");
-  const uuid = crypto.randomUUID();
+  const uuid = randomUUID();
   localStorage.setItem("selected", uuid);
   localStorage.setItem(uuid, bytesToBase64(model.toBytes()));
 
@@ -121,7 +134,7 @@ export function saveSelectedModelInStorage(model: Model) {
 }
 
 export function saveModelToStorage(model: Model) {
-  const uuid = crypto.randomUUID();
+  const uuid = randomUUID();
   localStorage.setItem("selected", uuid);
   localStorage.setItem(uuid, bytesToBase64(model.toBytes()));
   let modelsJson = localStorage.getItem("models");
@@ -228,7 +241,7 @@ export function duplicateModel(uuid: string): Model | null {
 
   duplicatedModel.setName(newName);
 
-  const newUuid = crypto.randomUUID();
+  const newUuid = randomUUID();
   localStorage.setItem("selected", newUuid);
   localStorage.setItem(newUuid, bytesToBase64(duplicatedModel.toBytes()));