2 files changed, 23 insertions, 7 deletions

diff --git a/src/ast.rs b/src/ast.rs
index f59d9f4..9ae92c6 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -164,6 +164,7 @@ fn extract_scenario(e: &[Element]) -> Result<(Option<Scenario>, usize)> {
         Element::Snippet(_) => Err(Error::scenario_before_heading()),
         Element::Heading(title, level) => {
             let mut scen = Scenario::new(&title);
+            let mut prevkind = StepKind::Given;
             for (i, item) in e.iter().enumerate().skip(1) {
                 match item {
                     Element::Heading(_, level2) => {
@@ -181,8 +182,9 @@ fn extract_scenario(e: &[Element]) -> Result<(Option<Scenario>, usize)> {
                     }
                     Element::Snippet(text) => {
                         for line in parse_scenario_snippet(&text) {
-                            let step = ScenarioStep::new_from_str(line)?;
+                            let step = ScenarioStep::new_from_str(line, prevkind)?;
                             scen.add(&step);
+                            prevkind = step.kind();
                         }
                     }
                 }
@@ -532,7 +534,7 @@ pub fn scenario_snippet(bindings: &Bindings, snippet: &str) -> Block {
 
 // Typeset a single scenario step as a sequence of Pandoc AST Inlines.
 fn step(bindings: &Bindings, text: &str) -> Vec<Inline> {
-    let step = ScenarioStep::new_from_str(text);
+    let step = ScenarioStep::new_from_str(text, StepKind::Given);
     if step.is_err() {
         eprintln!("Could not parse step: {}", text);
         return error_msg(&format!("Could not parse step: {}", text));
diff --git a/src/steps.rs b/src/steps.rs
index 66ab453..ccf7694 100644
--- a/src/steps.rs
+++ b/src/steps.rs
@@ -37,13 +37,18 @@ impl ScenarioStep {
     }
 
     /// Construct a step from a line in a scenario.
-    pub fn new_from_str(text: &str) -> Result<ScenarioStep> {
+    ///
+    /// If the step uses the "and" or "but" keyword, use the default
+    /// step kind instead.
+    pub fn new_from_str(text: &str, default: StepKind) -> Result<ScenarioStep> {
         let mut words = text.split_whitespace();
 
         let kind = match words.next() {
             Some("given") => StepKind::Given,
             Some("when") => StepKind::When,
             Some("then") => StepKind::Then,
+            Some("and") => default,
+            Some("but") => default,
             _ => return Err(Error::UnknownStepKind),
         };
 
@@ -99,28 +104,37 @@ mod test {
 
     #[test]
     fn parses_given() {
-        let step = ScenarioStep::new_from_str("given I am Tomjon").unwrap();
+        let step = ScenarioStep::new_from_str("given I am Tomjon", StepKind::Then).unwrap();
         assert_eq!(step.kind(), StepKind::Given);
         assert_eq!(step.text(), "I am Tomjon");
     }
 
     #[test]
     fn parses_given_with_extra_spaces() {
-        let step = ScenarioStep::new_from_str("   given     I   am   Tomjon   ").unwrap();
+        let step =
+            ScenarioStep::new_from_str("   given     I   am   Tomjon   ", StepKind::When).unwrap();
         assert_eq!(step.kind(), StepKind::Given);
         assert_eq!(step.text(), "I am Tomjon");
     }
 
     #[test]
     fn parses_when() {
-        let step = ScenarioStep::new_from_str("when I declare myself king").unwrap();
+        let step =
+            ScenarioStep::new_from_str("when I declare myself king", StepKind::Given).unwrap();
         assert_eq!(step.kind(), StepKind::When);
         assert_eq!(step.text(), "I declare myself king");
     }
 
     #[test]
     fn parses_then() {
-        let step = ScenarioStep::new_from_str("then everyone accepts it").unwrap();
+        let step = ScenarioStep::new_from_str("then everyone accepts it", StepKind::Given).unwrap();
+        assert_eq!(step.kind(), StepKind::Then);
+        assert_eq!(step.text(), "everyone accepts it");
+    }
+
+    #[test]
+    fn parses_and() {
+        let step = ScenarioStep::new_from_str("and everyone accepts it", StepKind::Then).unwrap();
         assert_eq!(step.kind(), StepKind::Then);
         assert_eq!(step.text(), "everyone accepts it");
     }