From 85819545122cc6d876c571cad896d54b9cbbcac3 Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Sun, 10 Nov 2019 14:06:44 +0000
Subject: [PATCH 01/10] output_format

---
 README.md                                     |   6 +-
 assets/OEBPS/package.opf                      |   9 +--
 assets/simsapa_md_to_epub.bat                 |   2 +-
 assets/simsapa_md_to_epub.sh                  |   2 +-
 assets/simsapa_md_to_mobi.bat                 |   2 +-
 assets/simsapa_md_to_mobi.sh                  |   2 +-
 scripts/build_dicts_for_release.sh            |   8 +--
 scripts/combined_to_mobi.sh                   |   2 +-
 scripts/ncped_to_epub.sh                      |   2 +-
 scripts/ncped_to_mobi.sh                      |   2 +-
 src/app.rs                                    |  59 ++++++-----------
 src/cli.yml                                   |   8 +--
 src/ebook.rs                                  |  60 +++++++++---------
 src/helpers.rs                                |   8 +--
 src/main.rs                                   |  10 +--
 .../data with space/ncped custom cover.md     |   2 -
 .../data/data with space/ncped with space.md  |   2 -
 .../data with space/ncped with space.xlsx     | Bin 7069 -> 7026 bytes
 tests/run_tests.sh                            |   6 +-
 19 files changed, 81 insertions(+), 111 deletions(-)

diff --git a/README.md b/README.md
index f0c103d..37d4ea2 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,6 @@ ndped-example.md
     book_id = "NcpedDictionarySimsapa"
     created_date_human = ""
     created_date_opf = ""
-    is_epub = true
-    is_mobi = false
     ```
     
     --- DICTIONARY WORD ENTRIES ---
@@ -162,7 +160,7 @@ SUBCOMMANDS:
 Process a Markdown file and generate an EPUB or MOBI dictionary.
 
 USAGE:
-    simsapa_dictionary markdown_to_ebook [FLAGS] [OPTIONS] --ebook_format <FORMAT>
+    simsapa_dictionary markdown_to_ebook [FLAGS] [OPTIONS] --output_format <FORMAT>
 
 FLAGS:
         --dont_remove_generated_files    Turns off the removal of the generated OPF, HTML, etc. files used to create the
@@ -176,7 +174,7 @@ FLAGS:
 
 OPTIONS:
         --dict_label <LABEL>            Use this dict_label property, instead of the one defined in the Markdown file.
-        --ebook_format <FORMAT>         Either EPUB or MOBI. [default: EPUB]  [possible values: EPUB, Epub, epub, MOBI,
+        --output_format <FORMAT>        Either EPUB or MOBI. [default: EPUB]  [possible values: EPUB, Epub, epub, MOBI,
                                         Mobi, mobi]
         --kindlegen_path <PATH>         The KindleGen tool must be available either (a) in the current folder with this
                                         tool, (b) in the system PATH, (c) declared with this option.
diff --git a/assets/OEBPS/package.opf b/assets/OEBPS/package.opf
index 31158f9..e1a3538 100644
--- a/assets/OEBPS/package.opf
+++ b/assets/OEBPS/package.opf
@@ -13,7 +13,7 @@
 
     <meta name="cover" content="item_cover"></meta>
 
-    {{#if meta.is_mobi ~}}
+    {{#if (eq output_format "Mobi") ~}}
     <x-metadata>
       <output encoding="utf-8"></output>
       <EmbeddedCover>{{meta.cover_path}}</EmbeddedCover>
@@ -27,7 +27,7 @@
   <manifest>
     <item id="htmltoc" href="htmltoc.xhtml" media-type="application/xhtml+xml" properties="nav"/>
 
-    {{#if meta.is_epub ~}}
+    {{#if (eq output_format "Epub") ~}}
     <item id="cover_page" href="cover.xhtml" media-type="application/xhtml+xml" properties="svg"/>
     {{/if ~}}
 
@@ -48,9 +48,10 @@
   </manifest>
 
   <spine toc="ncx">
-    {{#if meta.is_epub ~}}
+    {{#if (eq output_format "Epub") ~}}
     <itemref idref="cover_page"/>
-    {{else}}
+    {{/if ~}}
+    {{#if (eq output_format "Mobi") ~}}
     <itemref idref="item_cover"/>
     {{/if ~}}
 
diff --git a/assets/simsapa_md_to_epub.bat b/assets/simsapa_md_to_epub.bat
index 577096f..3c056e0 100755
--- a/assets/simsapa_md_to_epub.bat
+++ b/assets/simsapa_md_to_epub.bat
@@ -11,7 +11,7 @@ SET DEST_FILE=%SRC_NAME%.epub
 simsapa_dictionary.exe markdown_to_ebook ^
     --source_path "%~1" ^
     --dict_label "" ^
-    --ebook_format epub ^
+    --output_format epub ^
     --output_path "%DEST_FILE%"
 
 Exit /b
diff --git a/assets/simsapa_md_to_epub.sh b/assets/simsapa_md_to_epub.sh
index 556d4aa..21f2fde 100755
--- a/assets/simsapa_md_to_epub.sh
+++ b/assets/simsapa_md_to_epub.sh
@@ -7,6 +7,6 @@ DEST_FILE="$SRC_NAME.epub"
 simsapa_dictionary markdown_to_ebook \
     --source_path "$1" \
     --dict_label "" \
-    --ebook_format epub \
+    --output_format epub \
     --output_path "$DEST_FILE"
 
diff --git a/assets/simsapa_md_to_mobi.bat b/assets/simsapa_md_to_mobi.bat
index f2c1862..a4d41ed 100755
--- a/assets/simsapa_md_to_mobi.bat
+++ b/assets/simsapa_md_to_mobi.bat
@@ -11,7 +11,7 @@ SET DEST_FILE=%SRC_NAME%.mobi
 simsapa_dictionary.exe markdown_to_ebook ^
     --source_path "%~1" ^
     --dict_label "" ^
-    --ebook_format mobi ^
+    --output_format mobi ^
     --output_path "%DEST_FILE%" ^
     --mobi_compression 0 ^
     --kindlegen_path kindlegen.exe
diff --git a/assets/simsapa_md_to_mobi.sh b/assets/simsapa_md_to_mobi.sh
index 8bd4390..f06eb63 100644
--- a/assets/simsapa_md_to_mobi.sh
+++ b/assets/simsapa_md_to_mobi.sh
@@ -9,7 +9,7 @@ DEST_FILE="$SRC_NAME.mobi"
 simsapa_dictionary markdown_to_ebook \
     --source_path "$1" \
     --dict_label "" \
-    --ebook_format mobi \
+    --output_format mobi \
     --output_path "$DEST_FILE" \
     --mobi_compression 0
 
diff --git a/scripts/build_dicts_for_release.sh b/scripts/build_dicts_for_release.sh
index ae48fb7..951dbb5 100755
--- a/scripts/build_dicts_for_release.sh
+++ b/scripts/build_dicts_for_release.sh
@@ -12,7 +12,7 @@ for i in dhammika dppn ncped nyana pts; do
     cargo run -- markdown_to_ebook \
         --source_path "$SRC_DIR/$i.md" \
         --dict_label "" \
-        --ebook_format mobi \
+        --output_format mobi \
         --output_path "$OUT_DIR/$i.mobi" \
         --mobi_compression 0 \
         --kindlegen_path "$KINDLEGEN_PATH"
@@ -20,7 +20,7 @@ for i in dhammika dppn ncped nyana pts; do
     cargo run -- markdown_to_ebook \
         --source_path "$SRC_DIR/$i.md" \
         --dict_label "" \
-        --ebook_format epub \
+        --output_format epub \
         --output_path "$OUT_DIR/$i.epub"
 
 done
@@ -30,7 +30,7 @@ done
 cargo run -- markdown_to_ebook \
     --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --title "Combined Pali - English Dictionary" \
-    --ebook_format mobi \
+    --output_format mobi \
     --output_path "$OUT_DIR/combined-dictionary.mobi" \
     --mobi_compression 0 \
     --kindlegen_path "$KINDLEGEN_PATH"
@@ -38,6 +38,6 @@ cargo run -- markdown_to_ebook \
 cargo run -- markdown_to_ebook \
     --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --title "Combined Pali - English Dictionary" \
-    --ebook_format epub \
+    --output_format epub \
     --output_path "$OUT_DIR/combined-dictionary.epub"
 
diff --git a/scripts/combined_to_mobi.sh b/scripts/combined_to_mobi.sh
index 103c0a8..916c680 100755
--- a/scripts/combined_to_mobi.sh
+++ b/scripts/combined_to_mobi.sh
@@ -3,7 +3,7 @@
 cargo run -- markdown_to_ebook \
 	--source_paths_list ./scripts/combined_dict_md_paths.txt \
 	--title "Combined Pali - English Dictionary" \
-	--ebook_format mobi \
+	--output_format mobi \
 	--output_path ../simsapa-dictionary_releases/combined-dictionary.mobi \
 	--mobi_compression 0 \
 	--dont_remove_generated_files \
diff --git a/scripts/ncped_to_epub.sh b/scripts/ncped_to_epub.sh
index 3316bad..43c1c3b 100755
--- a/scripts/ncped_to_epub.sh
+++ b/scripts/ncped_to_epub.sh
@@ -3,7 +3,7 @@
 cargo run -- markdown_to_ebook \
   --source_path ../simsapa-dictionary-data/ncped.md \
   --dict_label "" \
-  --ebook_format epub \
+  --output_format epub \
   --output_path ../simsapa-dictionary_releases/ncped.epub
 
 
diff --git a/scripts/ncped_to_mobi.sh b/scripts/ncped_to_mobi.sh
index 8644818..8ea8760 100755
--- a/scripts/ncped_to_mobi.sh
+++ b/scripts/ncped_to_mobi.sh
@@ -3,7 +3,7 @@
 cargo run -- markdown_to_ebook \
   --source_path ../simsapa-dictionary-data/ncped.md \
   --dict_label "" \
-  --ebook_format mobi \
+  --output_format mobi \
   --output_path ../simsapa-dictionary_releases/ncped.mobi \
   --mobi_compression 0 \
   --kindlegen_path $HOME/lib/kindlegen/kindlegen
diff --git a/src/app.rs b/src/app.rs
index a59c7b1..9b0dfb5 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -11,13 +11,13 @@ use calamine::{open_workbook, Xlsx, Reader, RangeDeserializerBuilder};
 
 use crate::dict_word::{DictWord, DictWordHeader, DictWordXlsx};
 use crate::ebook::{
-    Ebook, EbookFormat, EbookMetadata, DICTIONARY_METADATA_SEP, DICTIONARY_WORD_ENTRIES_SEP,
+    Ebook, OutputFormat, EbookMetadata, DICTIONARY_METADATA_SEP, DICTIONARY_WORD_ENTRIES_SEP,
 };
 use crate::error::ToolError;
 use crate::helpers::{ensure_parent, ensure_parent_all, is_hidden};
 
 pub struct AppStartParams {
-    pub ebook_format: EbookFormat,
+    pub output_format: OutputFormat,
     pub json_path: Option<PathBuf>,
     pub nyanatiloka_root: Option<PathBuf>,
     pub source_paths: Option<Vec<PathBuf>>,
@@ -69,7 +69,7 @@ impl Default for AppStartParams {
         };
 
         AppStartParams {
-            ebook_format: EbookFormat::Epub,
+            output_format: OutputFormat::Epub,
             json_path: None,
             nyanatiloka_root: None,
             source_paths: None,
@@ -126,10 +126,10 @@ pub fn process_first_arg() -> Option<AppStartParams> {
 
     params.kindlegen_path = look_for_kindlegen();
 
-    params.ebook_format = if params.kindlegen_path.is_some() {
-        EbookFormat::Mobi
+    params.output_format = if params.kindlegen_path.is_some() {
+        OutputFormat::Mobi
     } else {
-        EbookFormat::Epub
+        OutputFormat::Epub
     };
 
     let filename = source_path.file_name().unwrap();
@@ -199,19 +199,19 @@ fn process_to_ebook(
     run_command: RunCommand)
     -> Result<(), Box<dyn Error>>
 {
-    if sub_matches.is_present("ebook_format") {
+    if sub_matches.is_present("output_format") {
         if let Ok(x) = sub_matches
-            .value_of("ebook_format")
+            .value_of("output_format")
                 .unwrap()
                 .parse::<String>()
         {
             let s = x.trim().to_lowercase();
             if s == "epub" {
-                params.ebook_format = EbookFormat::Epub;
+                params.output_format = OutputFormat::Epub;
             } else if s == "mobi" {
-                params.ebook_format = EbookFormat::Mobi;
+                params.output_format = OutputFormat::Mobi;
             } else {
-                params.ebook_format = EbookFormat::Epub;
+                params.output_format = OutputFormat::Epub;
             }
         }
     }
@@ -292,15 +292,20 @@ fn process_to_ebook(
             let p = ensure_parent(a);
             let filename = p.file_name().unwrap();
             let dir = p.parent().unwrap();
-            match params.ebook_format {
-                EbookFormat::Epub => {
+            match params.output_format {
+                OutputFormat::Epub => {
                     let p = dir.join(PathBuf::from(filename).with_extension("epub"));
                     params.output_path = Some(ensure_parent(&p));
                 }
-                EbookFormat::Mobi => {
+                OutputFormat::Mobi => {
                     let p = dir.join(PathBuf::from(filename).with_extension("mobi"));
                     params.output_path = Some(ensure_parent(&p));
                 }
+
+                _ => {
+                    let msg = "🔥 Only Epub or Mobi makes sense here.".to_string();
+                    return Err(Box::new(ToolError::Exit(msg)));
+                }
             }
         }
     }
@@ -776,7 +781,7 @@ pub fn process_markdown_list(
     Ok(())
 }
 
-fn parse_str_to_metadata(s: &str, ebook_format: EbookFormat) -> Result<EbookMetadata, Box<dyn Error>> {
+fn parse_str_to_metadata(s: &str) -> Result<EbookMetadata, Box<dyn Error>> {
     let mut meta: EbookMetadata = match toml::from_str(s) {
         Ok(x) => x,
         Err(e) => {
@@ -790,17 +795,6 @@ fn parse_str_to_metadata(s: &str, ebook_format: EbookFormat) -> Result<EbookMeta
     meta.created_date_human = Utc::now().to_rfc2822(); // Fri, 28 Nov 2014 12:00:09 +0000
     meta.created_date_opf = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
 
-    match ebook_format {
-        EbookFormat::Epub => {
-            meta.is_epub = true;
-            meta.is_mobi = false;
-        }
-        EbookFormat::Mobi => {
-            meta.is_epub = false;
-            meta.is_mobi = true;
-        }
-    }
-
     Ok(meta)
 }
 
@@ -826,7 +820,7 @@ pub fn process_markdown(source_path: &PathBuf, ebook: &mut Ebook) -> Result<(),
         .replace("``` toml", "")
         .replace("```", "");
 
-    ebook.meta = parse_str_to_metadata(&a, ebook.ebook_format)?;
+    ebook.meta = parse_str_to_metadata(&a)?;
 
     let a = parts.get(1).unwrap().to_string();
     let entries: Vec<Result<DictWord, Box<dyn Error>>> = a
@@ -912,17 +906,6 @@ pub fn process_xlsx(source_path: &PathBuf, ebook: &mut Ebook) -> Result<(), Box<
                 meta.created_date_human = Utc::now().to_rfc2822(); // Fri, 28 Nov 2014 12:00:09 +0000
                 meta.created_date_opf = Utc::now().to_rfc3339_opts(SecondsFormat::Secs, true);
 
-                match ebook.ebook_format {
-                    EbookFormat::Epub => {
-                        meta.is_epub = true;
-                        meta.is_mobi = false;
-                    }
-                    EbookFormat::Mobi => {
-                        meta.is_epub = false;
-                        meta.is_mobi = true;
-                    }
-                }
-
                 ebook.meta = meta;
             },
             None => {
diff --git a/src/cli.yml b/src/cli.yml
index 855b14c..24726c5 100644
--- a/src/cli.yml
+++ b/src/cli.yml
@@ -16,9 +16,9 @@ subcommands:
       about: "Process a Markdown file and generate an EPUB or MOBI dictionary."
 
       args:
-        - ebook_format:
+        - output_format:
             help: "Either EPUB or MOBI."
-            long: ebook_format
+            long: output_format
             value_name: FORMAT
             required: true
             takes_value: true
@@ -104,9 +104,9 @@ subcommands:
       about: "Process a XLSX (MS Excel Spreadsheet) file and generate an EPUB or MOBI dictionary."
 
       args:
-        - ebook_format:
+        - output_format:
             help: "Either EPUB or MOBI."
-            long: ebook_format
+            long: output_format
             value_name: FORMAT
             required: true
             takes_value: true
diff --git a/src/ebook.rs b/src/ebook.rs
index 0f72e2a..0cf83c4 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -9,6 +9,7 @@ use std::path::PathBuf;
 use handlebars::{self, Handlebars};
 use walkdir::WalkDir;
 use deunicode::deunicode;
+//use regex::Regex;
 
 use crate::app::{AppStartParams, ZipWith};
 use crate::dict_word::DictWord;
@@ -23,7 +24,7 @@ pub const DICTIONARY_WORD_ENTRIES_SEP: &str = "--- DICTIONARY WORD ENTRIES ---";
 #[derive(Serialize, Deserialize)]
 pub struct Ebook {
     pub meta: EbookMetadata,
-    pub ebook_format: EbookFormat,
+    pub output_format: OutputFormat,
     pub dict_words: BTreeMap<String, DictWord>,
     pub entries_manifest: Vec<EntriesManifest>,
     pub asset_files_string: BTreeMap<String, String>,
@@ -74,16 +75,14 @@ pub struct EbookMetadata {
     pub word_prefix: String,
     #[serde(default)]
     pub use_velthuis: bool,
-    #[serde(default)]
-    pub is_epub: bool,
-    #[serde(default)]
-    pub is_mobi: bool,
 }
 
 #[derive(Serialize, Deserialize, Copy, Clone)]
-pub enum EbookFormat {
+pub enum OutputFormat {
     Epub,
     Mobi,
+    BabylonGls,
+    StardictXml,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -99,7 +98,7 @@ pub struct LetterGroupTemplateData {
 }
 
 impl Ebook {
-    pub fn new(ebook_format: EbookFormat, output_path: &PathBuf) -> Self {
+    pub fn new(output_format: OutputFormat, output_path: &PathBuf) -> Self {
         // asset_files_string
         let mut afs: BTreeMap<String, String> = BTreeMap::new();
         // asset_files_byte
@@ -212,21 +211,9 @@ impl Ebook {
             include_bytes!("../assets/META-INF/com.apple.ibooks.display-options.xml").to_vec(),
         );
 
-        let mut meta = EbookMetadata::default();
-        match ebook_format {
-            EbookFormat::Epub => {
-                meta.is_epub = true;
-                meta.is_mobi = false;
-            }
-            EbookFormat::Mobi => {
-                meta.is_epub = false;
-                meta.is_mobi = true;
-            }
-        }
-
         Ebook {
-            meta,
-            ebook_format,
+            meta: EbookMetadata::default(),
+            output_format,
             dict_words: BTreeMap::new(),
             entries_manifest: Vec::new(),
             asset_files_string: afs,
@@ -281,6 +268,10 @@ impl Ebook {
             }
         }
 
+        // // Remove links until we can resolve them to entry file locations.
+        // let re = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
+        // let res = re.replace_all(markdown, "$1").to_string();
+
         if self.dict_words.contains_key(&w_key) {
             warn!(
                 "Double word: '{}'. Entries should be unique for word within one dictionary.",
@@ -386,7 +377,7 @@ impl Ebook {
         }
         self.build_base_dir = Some(build_base_dir.clone());
 
-        if let EbookFormat::Epub = self.ebook_format {
+        if let OutputFormat::Epub = self.output_format {
             self.mimetype_path = Some(build_base_dir.join("mimetype"));
 
             let meta_inf_dir = build_base_dir.join("META-INF");
@@ -414,9 +405,13 @@ impl Ebook {
 
         info!("Writing {} letter groups ...", groups.len());
 
-        let template_name = match self.ebook_format {
-            EbookFormat::Epub => "entries-epub.xhtml",
-            EbookFormat::Mobi => "entries-mobi.xhtml",
+        let template_name = match self.output_format {
+            OutputFormat::Epub => "entries-epub.xhtml",
+            OutputFormat::Mobi => "entries-mobi.xhtml",
+            _ => {
+                let msg = "🔥 Only Epub or Mobi makes sense here.".to_string();
+                return Err(Box::new(ToolError::Exit(msg)));
+            }
         };
 
         for (order_idx, group) in groups.groups.values_mut().enumerate() {
@@ -695,7 +690,7 @@ impl Ebook {
     pub fn write_oebps_files(&mut self) -> Result<(), Box<dyn Error>> {
         info!("write_oebps_files()");
 
-        if let EbookFormat::Epub = self.ebook_format {
+        if let OutputFormat::Epub = self.output_format {
             self.write_cover()?;
         }
 
@@ -909,15 +904,15 @@ impl Ebook {
     pub fn create_ebook(&mut self, app_params: &AppStartParams) -> Result<(), Box<dyn Error>> {
         self.create_ebook_build_folders()?;
 
-        match self.ebook_format {
-            EbookFormat::Epub => {
+        match self.output_format {
+            OutputFormat::Epub => {
                 self.write_mimetype()?;
                 self.write_meta_inf_files()?;
                 self.write_oebps_files()?;
                 self.zip_files_as_epub(app_params.zip_with)?;
             }
 
-            EbookFormat::Mobi => {
+            OutputFormat::Mobi => {
                 self.write_oebps_files()?;
 
                 if !app_params.dont_run_kindlegen {
@@ -928,6 +923,11 @@ impl Ebook {
                     self.run_kindlegen(&kindlegen_path, app_params.mobi_compression)?;
                 }
             }
+
+            _ => {
+                let msg = "🔥 Use create_ebook() only for Epub and Mobi.".to_string();
+                return Err(Box::new(ToolError::Exit(msg)));
+            }
         }
 
         Ok(())
@@ -1085,8 +1085,6 @@ impl Default for EbookMetadata {
             created_date_opf: "".to_string(),
             word_prefix: "".to_string(),
             use_velthuis: false,
-            is_epub: true,
-            is_mobi: false,
         }
     }
 }
diff --git a/src/helpers.rs b/src/helpers.rs
index 06c4476..cf016ac 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -5,7 +5,6 @@ use std::thread::sleep;
 use std::time::Duration;
 
 use handlebars::{Context, Handlebars, Helper, HelperResult, JsonRender, Output, RenderContext};
-use regex::Regex;
 use walkdir::DirEntry;
 
 use comrak::{markdown_to_html, ComrakOptions};
@@ -128,12 +127,7 @@ pub fn grammar_phonetic_transliteration(
 pub fn md2html(markdown: &str) -> String {
     let mut opts = ComrakOptions::default();
     opts.smart = true;
-
-    // Remove links until we can resolve them to entry file locations.
-    let re = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
-    let res = re.replace_all(markdown, "$1").to_string();
-
-    markdown_to_html(&res, &opts).trim().to_string()
+    markdown_to_html(markdown, &opts).trim().to_string()
 }
 
 pub fn is_hidden(entry: &DirEntry) -> bool {
diff --git a/src/main.rs b/src/main.rs
index ec89df6..66f8348 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -82,7 +82,7 @@ fn main() {
                 .output_path
                 .expect("output_path is missing.");
 
-            let mut ebook = Ebook::new(app_params.ebook_format, &p);
+            let mut ebook = Ebook::new(app_params.output_format, &p);
 
             app::process_suttacentral_json(
                 &app_params.json_path,
@@ -104,7 +104,7 @@ fn main() {
                 .output_path
                 .expect("output_path is missing.");
 
-            let mut ebook = Ebook::new(app_params.ebook_format, &p);
+            let mut ebook = Ebook::new(app_params.output_format, &p);
 
             app::process_nyanatiloka_entries(
                 &app_params.nyanatiloka_root,
@@ -124,7 +124,7 @@ fn main() {
         RunCommand::MarkdownToEbook | RunCommand::XlsxToEbook => {
             let o = app_params.output_path.clone();
             let output_path = o.expect("output_path is missing.");
-            let mut ebook = Ebook::new(app_params.ebook_format, &output_path);
+            let mut ebook = Ebook::new(app_params.output_format, &output_path);
 
             let paths = app_params.source_paths.clone();
             let p = paths.expect("source_paths is missing.");
@@ -170,7 +170,7 @@ fn main() {
         RunCommand::MarkdownToBabylon | RunCommand::XlsxToBabylon => {
             let o = app_params.output_path.clone();
             let output_path = o.expect("output_path is missing.");
-            let mut ebook = Ebook::new(app_params.ebook_format, &output_path);
+            let mut ebook = Ebook::new(app_params.output_format, &output_path);
 
             let paths = app_params.source_paths.clone();
             let p = paths.expect("source_paths is missing.");
@@ -212,7 +212,7 @@ fn main() {
         RunCommand::MarkdownToStardict | RunCommand::XlsxToStardict => {
             let o = app_params.output_path.clone();
             let output_path = o.expect("output_path is missing.");
-            let mut ebook = Ebook::new(app_params.ebook_format, &output_path);
+            let mut ebook = Ebook::new(app_params.output_format, &output_path);
 
             let paths = app_params.source_paths.clone();
             let p = paths.expect("source_paths is missing.");
diff --git a/tests/data/data with space/ncped custom cover.md b/tests/data/data with space/ncped custom cover.md
index 9f426b5..75e476e 100644
--- a/tests/data/data with space/ncped custom cover.md	
+++ b/tests/data/data with space/ncped custom cover.md	
@@ -10,8 +10,6 @@ book_id = "NcpedDictionarySimsapa"
 created_date_human = ""
 created_date_opf = ""
 use_velthuis = false
-is_epub = true
-is_mobi = false
 ```
 
 --- DICTIONARY WORD ENTRIES ---
diff --git a/tests/data/data with space/ncped with space.md b/tests/data/data with space/ncped with space.md
index f27b139..58e99f0 100644
--- a/tests/data/data with space/ncped with space.md	
+++ b/tests/data/data with space/ncped with space.md	
@@ -10,8 +10,6 @@ book_id = "NcpedDictionarySimsapa"
 created_date_human = ""
 created_date_opf = ""
 use_velthuis = false
-is_epub = true
-is_mobi = false
 ```
 
 --- DICTIONARY WORD ENTRIES ---
diff --git a/tests/data/data with space/ncped with space.xlsx b/tests/data/data with space/ncped with space.xlsx
index 5b70b91b7e5ae4661307d462bfed0cc0ba7590bc..e71f579dd67dc3c6d0b3bbd59a8d8391fa49929d 100644
GIT binary patch
delta 4459
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

delta 4397
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
a{s$lkh2mQ<VDuR1F(y!IAU@OeLH`FVJn4M^

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index af489d7..867d06d 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -68,7 +68,7 @@ cd "$TEST_TEMP"
 ./simsapa_dictionary markdown_to_ebook \
     --source_path "data/data with space/ncped with space.md" \
     --dict_label "" \
-    --ebook_format mobi \
+    --output_format mobi \
     --output_path "ncped here.mobi" \
     --mobi_compression 0 2>&1 | tee output.log
 
@@ -185,7 +185,7 @@ cd "$TEST_TEMP"
 
 ./simsapa_dictionary markdown_to_ebook \
     --source_path "data/data with space/ncped with space.md" \
-    --ebook_format epub
+    --output_format epub
 
 if [[ "$?" != "0" ]]; then
     echo "Test Failed."
@@ -238,7 +238,7 @@ cd "$TEST_TEMP"
 ./simsapa_dictionary xlsx_to_ebook \
     --source_path "data/data with space/ncped with space.xlsx" \
     --dict_label "" \
-    --ebook_format mobi \
+    --output_format mobi \
     --output_path "ncped here.mobi" \
     --mobi_compression 0 2>&1 | tee output.log
 

From 3e664187967a482e2f9929c97a37b81554922e28 Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Mon, 11 Nov 2019 09:26:33 +0000
Subject: [PATCH 02/10] see also start

---
 src/ebook.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/ebook.rs b/src/ebook.rs
index 0cf83c4..edfeec7 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -8,8 +8,8 @@ use std::path::PathBuf;
 
 use handlebars::{self, Handlebars};
 use walkdir::WalkDir;
+use regex::Regex;
 use deunicode::deunicode;
-//use regex::Regex;
 
 use crate::app::{AppStartParams, ZipWith};
 use crate::dict_word::DictWord;
@@ -268,10 +268,6 @@ impl Ebook {
             }
         }
 
-        // // Remove links until we can resolve them to entry file locations.
-        // let re = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
-        // let res = re.replace_all(markdown, "$1").to_string();
-
         if self.dict_words.contains_key(&w_key) {
             warn!(
                 "Double word: '{}'. Entries should be unique for word within one dictionary.",
@@ -1064,6 +1060,68 @@ impl Ebook {
         self.meta_inf_dir = None;
         self.oebps_dir = None;
     }
+
+    pub fn process_see_also_from_definition(&mut self) {
+        // [abbha(t)](/define/abbha(t))
+        // [abhu(ṃ)](/define/abhu(ṃ)
+        // FIXME (n) (t)
+        let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
+        // We're going to temporarily replace links as [[abbha]]
+        let re_bracket_links = Regex::new(r"\[\[([^]]+)\]\]").unwrap();
+        // (see also *[abbuhati](/define/abbuhati)* and *[abbūhati](/define/abbūhati)*)
+        // (see *[abbha](/define/abbha)*)
+        let re_see_also = Regex::new(r"\(see ([^\)]+)\)").unwrap();
+
+        // words with and without italics (stars) have to be covered
+        // word must be min. 3 chars long
+        // (also *anūpanāhi(n)*)
+        // (also *abhisāpeti*)
+        // (see *[upanāhi(n)](/define/upanāhi(n))*)
+        // (see *[upaparikkha(t)](/define/upaparikkha(t))*)
+        // FIXME (n) (t) (\([a-z]\)?)
+
+        let re_also_one_plain = Regex::new(r"\(also +([^\*\(\),]{3,})\)").unwrap();
+        let re_also_one_italics = Regex::new(r"\(also +\*([^\*\(\),]{3,})\*\)").unwrap();
+        // (also *abhisaṅkhaṭa* and *abhisaṅkhita*)
+        let re_also_two_plain = Regex::new(r"\(also +([^\*\(\), ]{3,})(, +| +and +|, +and +| +& +)([^\*\(\)]{3,})\)").unwrap();
+        let re_also_two_italics = Regex::new(r"\(also +\*([^\*\(\), ]{3,})\*(, +| +and +|, +and +| +& +)\*([^\*\(\)]{3,})\*\)").unwrap();
+        // (also *apabyūhati*, *apaviyūhati*, and *apabbūhati*)
+        let re_also_three_plain = Regex::new(r"\(also +([^\*\(\), ]{3,}), +([^\*\(\), ]{3,})(, +| +and +|, +and +| +& +)([^\*\(\)]{3,})\)").unwrap();
+        let re_also_three_italics = Regex::new(r"\(also +\*([^\*\(\), ]{3,})\*, +\*([^\*\(\), ]{3,})\*(, +| +and +|, +and +| +& +)\*([^\*\(\)]{3,})\*\)").unwrap();
+
+        // FIXME have to check valid words
+
+        for (_, w) in self.dict_words.iter_mut() {
+            let mut def: String = w.definition_md.clone();
+
+            // (also *abhisāpeti*) -> (see [abhisāpeti](/define/abhisāpeti))
+            def = re_also_three_italics.replace_all(&def, "(see [$1](/define/$1), [$2](/define/$2) and [$4](/define/$4))").to_string();
+            def = re_also_three_plain.replace_all(&def, "(see [$1](/define/$1), [$2](/define/$2) and [$4](/define/$4))").to_string();
+
+            def = re_also_two_italics.replace_all(&def, "(see [$1](/define/$1) and [$3](/define/$3))").to_string();
+            def = re_also_two_plain.replace_all(&def, "(see [$1](/define/$1) and [$3](/define/$3))").to_string();
+
+            def = re_also_one_italics.replace_all(&def, "(see [$1](/define/$1))").to_string();
+            def = re_also_one_plain.replace_all(&def, "(see [$1](/define/$1))").to_string();
+
+            // Collect /define links from the text and add to see_also list.
+
+            for link in re_define.captures_iter(&def) {
+                w.word_header.see_also.push(link[2].to_string());
+            }
+
+            // [wordlabel](/define/wordlink) -> [[wordlink]]
+            def = re_define.replace_all(&def, "[[$2]]").to_string();
+            // Remove 'See also' from the text.
+            def = re_see_also.replace_all(&def, "").to_string();
+            // [[wordlink]] -> [wordlink](bword://wordlink)
+            def = re_bracket_links.replace_all(&def, "[$1](bword://$1)").to_string();
+            // replace remaining /define links as bword://
+            def = re_define.replace_all(&def, "[$1](bword://$2)").to_string();
+
+            w.definition_md = def;
+        }
+    }
 }
 
 fn reg_tmpl(h: &mut Handlebars, k: &str, afs: &BTreeMap<String, String>) {

From 66a8e41361aeb59ef017df07cf7b6cb1bad4411a Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Mon, 11 Nov 2019 12:12:01 +0000
Subject: [PATCH 03/10] see_also test

---
 src/ebook.rs                    |  27 ++++---
 src/lib.rs                      |  31 ++++++++
 tests/see_also.rs               |  25 ++++++
 tests/see_also_simple.md        |  64 +++++++++++++++
 tests/see_also_simple_expect.md | 136 ++++++++++++++++++++++++++++++++
 5 files changed, 274 insertions(+), 9 deletions(-)
 create mode 100644 src/lib.rs
 create mode 100644 tests/see_also.rs
 create mode 100644 tests/see_also_simple.md
 create mode 100644 tests/see_also_simple_expect.md

diff --git a/src/ebook.rs b/src/ebook.rs
index edfeec7..c7cfad1 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -300,6 +300,15 @@ impl Ebook {
         self.dict_words.is_empty()
     }
 
+    pub fn entries_as_markdown(&self) -> String {
+        info!("entries_as_markdown()");
+        self.dict_words
+            .values()
+            .map(|i| i.as_markdown_and_toml_string())
+            .collect::<Vec<String>>()
+            .join("\n\n")
+    }
+
     pub fn write_markdown(&self) -> Result<(), Box<dyn Error>> {
         info!("write_markdown()");
 
@@ -319,14 +328,7 @@ impl Ebook {
 
         // Write entries.
 
-        let content = self
-            .dict_words
-            .values()
-            .map(|i| i.as_markdown_and_toml_string())
-            .collect::<Vec<String>>()
-            .join("\n\n");
-
-        file.write_all(content.as_bytes())?;
+        file.write_all(self.entries_as_markdown().as_bytes())?;
 
         Ok(())
     }
@@ -1070,7 +1072,7 @@ impl Ebook {
         let re_bracket_links = Regex::new(r"\[\[([^]]+)\]\]").unwrap();
         // (see also *[abbuhati](/define/abbuhati)* and *[abbūhati](/define/abbūhati)*)
         // (see *[abbha](/define/abbha)*)
-        let re_see_also = Regex::new(r"\(see ([^\)]+)\)").unwrap();
+        let re_see_also = Regex::new(r" *\(see ([^\)]+)\)").unwrap();
 
         // words with and without italics (stars) have to be covered
         // word must be min. 3 chars long
@@ -1128,6 +1130,12 @@ fn reg_tmpl(h: &mut Handlebars, k: &str, afs: &BTreeMap<String, String>) {
     h.register_template_string(k, afs.get(k).unwrap()).unwrap();
 }
 
+impl Default for Ebook {
+    fn default() -> Self {
+        Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"))
+    }
+}
+
 impl Default for EbookMetadata {
     fn default() -> Self {
         EbookMetadata {
@@ -1146,3 +1154,4 @@ impl Default for EbookMetadata {
         }
     }
 }
+
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..1971583
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,31 @@
+extern crate regex;
+extern crate walkdir;
+
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde_json;
+extern crate toml;
+extern crate calamine;
+
+extern crate html2md;
+extern crate zip;
+
+#[macro_use]
+extern crate log;
+extern crate env_logger;
+extern crate kankyo;
+extern crate chrono;
+
+extern crate comrak;
+extern crate handlebars;
+extern crate deunicode;
+
+pub mod app;
+pub mod dict_word;
+pub mod ebook;
+pub mod error;
+pub mod helpers;
+pub mod letter_groups;
+pub mod pali;
+
diff --git a/tests/see_also.rs b/tests/see_also.rs
new file mode 100644
index 0000000..af6bd2a
--- /dev/null
+++ b/tests/see_also.rs
@@ -0,0 +1,25 @@
+use std::path::PathBuf;
+use std::fs;
+//use std::fs::File;
+//use std::io::Write;
+
+extern crate simsapa_dictionary;
+
+use simsapa_dictionary::app;
+use simsapa_dictionary::ebook::{Ebook, OutputFormat};
+
+#[test]
+fn see_also_from_definition_simple() {
+    let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
+
+    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/see_also_simple.md")];
+
+    app::process_markdown_list(sources, &mut ebook).unwrap();
+
+    ebook.process_see_also_from_definition();
+
+    let res = ebook.entries_as_markdown();
+    let expect = fs::read_to_string(&PathBuf::from("./tests/see_also_simple_expect.md")).unwrap();
+
+    assert_eq!(res, expect);
+}
diff --git a/tests/see_also_simple.md b/tests/see_also_simple.md
new file mode 100644
index 0000000..72842c1
--- /dev/null
+++ b/tests/see_also_simple.md
@@ -0,0 +1,64 @@
+--- DICTIONARY METADATA ---
+
+``` toml
+title = "Dictionary"
+```
+
+--- DICTIONARY WORD ENTRIES ---
+
+``` toml
+word = "abalabala"
+```
+
+mfn. very foolish, very feeble; babbling (?) (see also *[abaḷabaḷa](/define/abaḷabaḷa)*)
+
+``` toml
+word = "abaḷabaḷa"
+```
+
+mfn. very foolish, very feeble; babbling (?) (see also *[abalabala](/define/abalabala)*)
+
+``` toml
+word = "abbahana"
+```
+
+neuter (from abbahati) pulling out, drawing out (see also *[abbuhana](/define/abbuhana)* and *[abbūhana](/define/abbūhana)*)
+
+``` toml
+word = "abbahati"
+```
+
+pr. 3 sg. tears up or off; pulls out, draws out (see also *[abbuhati](/define/abbuhati)* and *[abbūhati](/define/abbūhati)*)
+
+``` toml
+word = "abbahi"
+```
+
+aor. 3 sg. (see *[abbahati](/define/abbahati)*)
+
+``` toml
+word = "abbahitvā"
+```
+
+absol. (see *[abbahati](/define/abbahati)*)
+
+``` toml
+word = "abbha"
+```
+
+abbha
+
+masculine n. \~ā, feminine a cloud; a thundercloud.
+
+``` toml
+word = "abbhamatta"
+```
+
+neuter (or mfn.) (also *abbhāmatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
+
+``` toml
+word = "abbhamātta"
+```
+
+neuter (or mfn.) (also *abbhamatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
+
diff --git a/tests/see_also_simple_expect.md b/tests/see_also_simple_expect.md
new file mode 100644
index 0000000..c44f522
--- /dev/null
+++ b/tests/see_also_simple_expect.md
@@ -0,0 +1,136 @@
+``` toml
+dict_label = ""
+word = "abalabala"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abaḷabaḷa"]
+```
+
+mfn. very foolish, very feeble; babbling (?)
+
+``` toml
+dict_label = ""
+word = "abaḷabaḷa"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["abalabala"]
+synonyms = []
+antonyms = []
+see_also = ["abalabala"]
+```
+
+mfn. very foolish, very feeble; babbling (?)
+
+``` toml
+dict_label = ""
+word = "abbahana"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbuhana", "abbūhana"]
+```
+
+neuter (from abbahati) pulling out, drawing out
+
+``` toml
+dict_label = ""
+word = "abbahati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbuhati", "abbūhati"]
+```
+
+pr. 3 sg. tears up or off; pulls out, draws out
+
+``` toml
+dict_label = ""
+word = "abbahi"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbahati"]
+```
+
+aor. 3 sg.
+
+``` toml
+dict_label = ""
+word = "abbahitvā"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["abbahitva"]
+synonyms = []
+antonyms = []
+see_also = ["abbahati"]
+```
+
+absol.
+
+``` toml
+dict_label = ""
+word = "abbha"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+```
+
+abbha
+
+masculine n. \~ā, feminine a cloud; a thundercloud.
+
+``` toml
+dict_label = ""
+word = "abbhamatta"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbhāmatta", "abbha"]
+```
+
+neuter (or mfn.) (of) the size of a cloud
+
+``` toml
+dict_label = ""
+word = "abbhamātta"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["abbhamatta"]
+synonyms = []
+antonyms = []
+see_also = ["abbhamatta", "abbha"]
+```
+
+neuter (or mfn.) (of) the size of a cloud
\ No newline at end of file

From a8e47d6d8ffcd1af7ef146c5c1bf36e74afff30e Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Wed, 13 Nov 2019 15:48:31 +0000
Subject: [PATCH 04/10] more see also

---
 src/app.rs                                    |  4 +-
 src/dict_word.rs                              |  4 ++
 src/ebook.rs                                  |  8 +--
 src/main.rs                                   | 13 ++++-
 tests/data/see_also/see_also_parens.md        | 55 +++++++++++++++++++
 tests/data/see_also/see_also_parens_expect.md |  0
 tests/{ => data/see_also}/see_also_simple.md  |  0
 .../see_also}/see_also_simple_expect.md       |  0
 tests/see_also.rs                             | 26 ++++++++-
 9 files changed, 98 insertions(+), 12 deletions(-)
 create mode 100644 tests/data/see_also/see_also_parens.md
 create mode 100644 tests/data/see_also/see_also_parens_expect.md
 rename tests/{ => data/see_also}/see_also_simple.md (100%)
 rename tests/{ => data/see_also}/see_also_simple_expect.md (100%)

diff --git a/src/app.rs b/src/app.rs
index 9b0dfb5..deedde2 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -5,8 +5,8 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use chrono::prelude::*;
-use regex::Regex;
 use walkdir::WalkDir;
+use regex::Regex;
 use calamine::{open_workbook, Xlsx, Reader, RangeDeserializerBuilder};
 
 use crate::dict_word::{DictWord, DictWordHeader, DictWordXlsx};
@@ -691,7 +691,7 @@ pub fn process_suttacentral_json(
                 antonyms: Vec::new(),
                 see_also: Vec::new(),
             },
-            definition_md: html_to_markdown(&e.text),
+            definition_md: html_to_markdown(&e.text).to_string(),
         };
 
         ebook.add_word(new_word)
diff --git a/src/dict_word.rs b/src/dict_word.rs
index 554190a..8d4284b 100644
--- a/src/dict_word.rs
+++ b/src/dict_word.rs
@@ -148,6 +148,10 @@ impl DictWord {
 
         let mut summary = self.definition_md.trim().to_string();
 
+        // strip links
+        let re_links = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
+        summary = re_links.replace_all(&summary, "$1").to_string();
+
         // newlines to space
         summary = summary.replace("\n", " ");
         // contract multiple spaces
diff --git a/src/ebook.rs b/src/ebook.rs
index c7cfad1..9b88989 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -1091,8 +1091,6 @@ impl Ebook {
         let re_also_three_plain = Regex::new(r"\(also +([^\*\(\), ]{3,}), +([^\*\(\), ]{3,})(, +| +and +|, +and +| +& +)([^\*\(\)]{3,})\)").unwrap();
         let re_also_three_italics = Regex::new(r"\(also +\*([^\*\(\), ]{3,})\*, +\*([^\*\(\), ]{3,})\*(, +| +and +|, +and +| +& +)\*([^\*\(\)]{3,})\*\)").unwrap();
 
-        // FIXME have to check valid words
-
         for (_, w) in self.dict_words.iter_mut() {
             let mut def: String = w.definition_md.clone();
 
@@ -1116,10 +1114,8 @@ impl Ebook {
             def = re_define.replace_all(&def, "[[$2]]").to_string();
             // Remove 'See also' from the text.
             def = re_see_also.replace_all(&def, "").to_string();
-            // [[wordlink]] -> [wordlink](bword://wordlink)
-            def = re_bracket_links.replace_all(&def, "[$1](bword://$1)").to_string();
-            // replace remaining /define links as bword://
-            def = re_define.replace_all(&def, "[$1](bword://$2)").to_string();
+            // [[wordlink]] -> [wordlink](/define/wordlink)
+            def = re_bracket_links.replace_all(&def, "[$1](/define/$1)").to_string();
 
             w.definition_md = def;
         }
diff --git a/src/main.rs b/src/main.rs
index 66f8348..6d99f69 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,6 +34,7 @@ pub mod letter_groups;
 pub mod pali;
 
 use std::process::exit;
+use regex::Regex;
 
 use app::RunCommand;
 use ebook::Ebook;
@@ -90,12 +91,14 @@ fn main() {
                 &mut ebook,
             );
 
+            info!("Added words: {}", ebook.len());
+
+            ebook.process_see_also_from_definition();
+
             for (_key, word) in ebook.dict_words.iter_mut() {
                 ok_or_exit(app_params.used_first_arg, word.clean_summary());
             }
 
-            info!("Added words: {}", ebook.len());
-
             ok_or_exit(app_params.used_first_arg, ebook.write_markdown());
         }
 
@@ -196,6 +199,12 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            // Convert /define/word links with bword://word, as recognized by Stardict.
+            for (_, w) in ebook.dict_words.iter_mut() {
+                let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
+                w.definition_md = re_define.replace_all(&w.definition_md, "[$1](bword://$2)").to_string();
+            }
+
             if let Some(ref title) = app_params.title {
                 ebook.meta.title = title.clone();
             }
diff --git a/tests/data/see_also/see_also_parens.md b/tests/data/see_also/see_also_parens.md
new file mode 100644
index 0000000..ed5beb6
--- /dev/null
+++ b/tests/data/see_also/see_also_parens.md
@@ -0,0 +1,55 @@
+--- DICTIONARY METADATA ---
+
+``` toml
+title = "Dictionary"
+```
+
+--- DICTIONARY WORD ENTRIES ---
+
+``` toml
+word = "anupanāhi"
+```
+
+anupanāhi(n)
+
+mfn. (also *anūpanāhi(n)*) not resentful; without rancor (see *[upanāhi(n)](/define/upanāhi(n))*).
+
+``` toml
+word = "anādhānagāhin"
+```
+
+anādhānagāhinanādhāna(g)gāhi(n)
+
+neg. mfn. (see *[ādhāna(g)gāhi(n)](/define/ādhāna(g)gāhi(n))*)
+
+``` toml
+word = "abbhu"
+```
+
+abbhu(ṃ)
+
+ind. an exclamation of horror or fright or aversion (see also *[abhu(ṃ)](/define/abhu(ṃ))*)
+
+``` toml
+word = "kāḷānusāri"
+```
+
+kāḷānusāri
+
+masculine (or *kāḷānusāri(n)*?) a fragrant root; a powder made from this root (see *[kāla](/define/kāla)*)
+
+``` toml
+word = "uggharanta"
+```
+
+uggharanta
+
+mfn. (or ugghara(t)) dripping; oozing.
+
+``` toml
+word = "uddhaṅ-gāmi"
+```
+
+uddhaṅ\-gāmi(n)
+
+mfn. (also *uddhagāmi(n)*) going upwards; going upstream (see *[uddhaṃ](/define/uddhaṃ)*)
diff --git a/tests/data/see_also/see_also_parens_expect.md b/tests/data/see_also/see_also_parens_expect.md
new file mode 100644
index 0000000..e69de29
diff --git a/tests/see_also_simple.md b/tests/data/see_also/see_also_simple.md
similarity index 100%
rename from tests/see_also_simple.md
rename to tests/data/see_also/see_also_simple.md
diff --git a/tests/see_also_simple_expect.md b/tests/data/see_also/see_also_simple_expect.md
similarity index 100%
rename from tests/see_also_simple_expect.md
rename to tests/data/see_also/see_also_simple_expect.md
diff --git a/tests/see_also.rs b/tests/see_also.rs
index af6bd2a..748a0d3 100644
--- a/tests/see_also.rs
+++ b/tests/see_also.rs
@@ -12,14 +12,36 @@ use simsapa_dictionary::ebook::{Ebook, OutputFormat};
 fn see_also_from_definition_simple() {
     let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
 
-    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/see_also_simple.md")];
+    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/see_also/see_also_simple.md")];
 
     app::process_markdown_list(sources, &mut ebook).unwrap();
 
     ebook.process_see_also_from_definition();
 
     let res = ebook.entries_as_markdown();
-    let expect = fs::read_to_string(&PathBuf::from("./tests/see_also_simple_expect.md")).unwrap();
+    let expect = fs::read_to_string(&PathBuf::from("./tests/data/see_also/see_also_simple_expect.md")).unwrap();
 
     assert_eq!(res, expect);
 }
+
+/*
+#[test]
+fn see_also_from_definition_parens() {
+    let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
+
+    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/see_also/see_also_parens.md")];
+
+    app::process_markdown_list(sources, &mut ebook).unwrap();
+
+    ebook.process_see_also_from_definition();
+
+    let res = ebook.entries_as_markdown();
+    //let mut file = File::create(&PathBuf::from("./tests/data/see_also/see_also_parens_expect.md")).unwrap();
+    //file.write_all(res.as_bytes()).unwrap();
+
+    let expect = fs::read_to_string(&PathBuf::from("./tests/data/see_also/see_also_parens_expect.md")).unwrap();
+    let expect = "".to_string();
+
+    assert_eq!(res, expect);
+}
+*/

From 077893a7a8ed7a57eca8259bc3de5a5e13395dfe Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Thu, 14 Nov 2019 17:54:06 +0000
Subject: [PATCH 05/10] also written as

---
 src/app.rs                                    |   2 +
 src/dict_word.rs                              | 200 +-----
 src/ebook.rs                                  | 350 +++++++++-
 src/main.rs                                   |  12 +-
 tests/data/grammar_note/grammar_note.md       | 661 ++++++++++++++++++
 .../data/grammar_note/grammar_note_expect.md  | 577 +++++++++++++++
 ..._also.rs => processing_from_definition.rs} |  23 +
 7 files changed, 1625 insertions(+), 200 deletions(-)
 create mode 100644 tests/data/grammar_note/grammar_note.md
 create mode 100644 tests/data/grammar_note/grammar_note_expect.md
 rename tests/{see_also.rs => processing_from_definition.rs} (63%)

diff --git a/src/app.rs b/src/app.rs
index deedde2..9802a01 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -690,6 +690,7 @@ pub fn process_suttacentral_json(
                 synonyms: Vec::new(),
                 antonyms: Vec::new(),
                 see_also: Vec::new(),
+                also_written_as: Vec::new(),
             },
             definition_md: html_to_markdown(&e.text).to_string(),
         };
@@ -762,6 +763,7 @@ pub fn process_nyanatiloka_entries(
                 synonyms: Vec::new(),
                 antonyms: Vec::new(),
                 see_also: Vec::new(),
+                also_written_as: Vec::new(),
             },
             definition_md: html_to_markdown(&e.text),
         };
diff --git a/src/dict_word.rs b/src/dict_word.rs
index 8d4284b..0320fc2 100644
--- a/src/dict_word.rs
+++ b/src/dict_word.rs
@@ -1,4 +1,3 @@
-use regex::Regex;
 use std::default::Default;
 use std::error::Error;
 
@@ -46,6 +45,10 @@ pub struct DictWordXlsx {
     #[serde(default)]
     pub see_also: String,
 
+    /// comma-seperated list
+    #[serde(default)]
+    pub also_written_as: String,
+
     pub definition_md: String,
 }
 
@@ -72,6 +75,8 @@ pub struct DictWordHeader {
     pub antonyms: Vec<String>,
     #[serde(default)]
     pub see_also: Vec<String>,
+    #[serde(default)]
+    pub also_written_as: Vec<String>,
 }
 
 impl DictWord {
@@ -132,201 +137,11 @@ impl DictWord {
                 synonyms: DictWord::parse_csv_list(&w.synonyms),
                 antonyms: DictWord::parse_csv_list(&w.antonyms),
                 see_also: DictWord::parse_csv_list(&w.see_also),
+                also_written_as: DictWord::parse_csv_list(&w.also_written_as),
             },
             definition_md: w.definition_md.clone(),
         }
     }
-
-    pub fn clean_summary(&mut self) -> Result<(), Box<dyn Error>> {
-        if !self.word_header.summary.is_empty() {
-            self.word_header.summary = self.word_header.summary.trim().to_string();
-        }
-
-        if !self.word_header.summary.is_empty() {
-            return Ok(());
-        }
-
-        let mut summary = self.definition_md.trim().to_string();
-
-        // strip links
-        let re_links = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
-        summary = re_links.replace_all(&summary, "$1").to_string();
-
-        // newlines to space
-        summary = summary.replace("\n", " ");
-        // contract multiple spaces
-        let re_spaces = Regex::new("  +").unwrap();
-        summary = re_spaces.replace_all(&summary, " ").trim().to_string();
-
-        // remaining html tags
-        summary = summary.replace("<sup>", "");
-        summary = summary.replace("</sup>", "");
-        summary = summary.replace("<i>", "");
-        summary = summary.replace("</i>", "");
-        summary = summary.replace("<b>", "");
-        summary = summary.replace("</b>", "");
-
-        let re_chars = Regex::new(r"[\n\t<>]").unwrap();
-        summary = re_chars.replace_all(&summary, " ").trim().to_string();
-
-        // slash escapes
-        // un\-angered -> un-angered
-        // un\\-angered -> un-angered
-        summary = summary.replace(r"\\", "");
-        summary = summary.replace(r"\", "");
-
-        // See... with markdown link
-        // (see *[abbha](/define/abbha)*) -> (see abbha)
-        let re_see_markdown_links = Regex::new(r"\(see \*\[([^\]]+)\]\([^\)]+\)\**\)").unwrap();
-        summary = re_see_markdown_links
-            .replace_all(&summary, "(see $1)")
-            .trim()
-            .to_string();
-
-        // markdown links
-        // [abbha](/define/abbha) -> abbha
-        let re_markdown_links = Regex::new(r"\[([^\]]+)\]\([^\)]+\)").unwrap();
-        summary = re_markdown_links
-            .replace_all(&summary, "$1")
-            .trim()
-            .to_string();
-
-        // remaining markdown markup: *, []
-        let re_markdown = Regex::new(r"[\*\[\]]").unwrap();
-        summary = re_markdown.replace_all(&summary, "").trim().to_string();
-
-        // Don't remove (see ...), so that one can look up the next word when noticing it in the
-        // search hits.
-
-        // (from|or|also ...)
-        let re_from = Regex::new(r"^\((from|or|also) +[^\)]+\)").unwrap();
-
-        // 1
-        // 1.
-        let re_num = Regex::new(r"^[0-9]\.*").unwrap();
-
-        // grammar abbr., with- or without dot, with- or without parens
-        let re_abbr_one = Regex::new(r"^\(*(d|f|m|ṃ|n|r|s|t)\.*\)*\.*\b").unwrap();
-        let re_abbr_two = Regex::new(r"^\(*(ac|fn|id|mf|pl|pp|pr|sg|si)\.*\)*\.*\b").unwrap();
-        let re_abbr_three = Regex::new(
-            r"^\(*(abl|acc|act|adv|aor|dat|fpp|fut|gen|inc|ind|inf|loc|mfn|neg|opt)\.*\)*\.*\b",
-        )
-        .unwrap();
-        let re_abbr_four = Regex::new(r"^\(*(caus|part|pass|pron)\.*\)*\.*\b").unwrap();
-        let re_abbr_more = Regex::new(r"^\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|neuter|plural|singular)\.*\)*\.*\b").unwrap();
-
-        // (~ontī)
-        // (-ikā)n.
-        let re_suffix = Regex::new(r"^\([~-][^\)]+\)\w*\.*").unwrap();
-
-        // agga-m-agga
-        // abhi-uggantvā
-        let re_hyphenated_twice = Regex::new(r"^\w+-\w+-\w+\b").unwrap();
-        let re_hyphenated_once = Regex::new(r"^\w+-\w+\b").unwrap();
-
-        let max_iter = 10;
-        let mut n_iter = 0;
-
-        loop {
-            let word = self.word_header.word.clone();
-            // the whole word
-            //  abhijanat, abhikamin
-            let mut s = summary.trim_start_matches(&word).trim().to_string();
-
-            // part of the word
-            // abhijana(t)
-            // abhikami(n)
-            let (char_idx, _char) = word.char_indices().last().unwrap();
-            let w = word[..char_idx].to_string();
-            s = s.trim_start_matches(&w).trim().to_string();
-
-            s = re_hyphenated_twice.replace(&s, "").trim().to_string();
-            s = re_hyphenated_once.replace(&s, "").trim().to_string();
-
-            s = re_num.replace(&s, "").trim().to_string();
-            s = re_from.replace(&s, "").trim().to_string();
-
-            s = re_suffix.replace(&s, "").trim().to_string();
-
-            s = s.trim_start_matches('.').trim().to_string();
-            s = s.trim_start_matches(',').trim().to_string();
-            s = s.trim_start_matches('-').trim().to_string();
-
-            // (?)
-            s = s.trim_start_matches("(?)").trim().to_string();
-            s = s.trim_start_matches("?)").trim().to_string();
-
-            // pp space
-            s = s.trim_start_matches("pp ").trim().to_string();
-            // abbr, start with longer patterns
-            s = re_abbr_more.replace(&s, "").trim().to_string();
-            s = re_abbr_four.replace(&s, "").trim().to_string();
-            s = re_abbr_three.replace(&s, "").trim().to_string();
-            s = re_abbr_two.replace(&s, "").trim().to_string();
-            s = re_abbr_one.replace(&s, "").trim().to_string();
-
-            // FIXME somehow the above sometimes leaves the closing paren and dot
-            s = s.trim_start_matches(')').trim().to_string();
-            s = s.trim_start_matches('.').trim().to_string();
-            s = s.trim_start_matches(';').trim().to_string();
-
-            // ~ā
-            s = s.trim_start_matches(r"~ā,").trim().to_string();
-            s = s.trim_start_matches(r"~ā").trim().to_string();
-            // (& m.)
-            s = s.trim_start_matches(r"(& m.)").trim().to_string();
-            s = s.trim_start_matches(r"(& f.)").trim().to_string();
-            s = s.trim_start_matches(r"(& n.)").trim().to_string();
-
-            // m(fn).
-            s = s.trim_start_matches("(& mfn.)").trim().to_string();
-            s = s.trim_start_matches("m(fn)").trim().to_string();
-            s = s.trim_start_matches('.').trim().to_string();
-
-            // m.a
-            s = s.trim_start_matches("m.a").trim().to_string();
-            // &
-            s = s.trim_start_matches('&').trim().to_string();
-            // fpp[.]
-            s = s.trim_start_matches("fpp[.]").trim().to_string();
-
-            n_iter += 1;
-
-            if s == summary {
-                // stop if there was no change
-                break;
-            } else if n_iter == max_iter {
-                // or we hit max_iter
-                info!("max_iter reached: {}", s);
-                summary = s;
-                break;
-            } else {
-                // apply changes and loop again
-                summary = s;
-            }
-        }
-
-        // cap the length of the final summary
-
-        if !summary.is_empty() {
-            let sum_length = 50;
-            if summary.char_indices().count() > sum_length {
-                let (char_idx, _char) = summary
-                    .char_indices()
-                    .nth(sum_length)
-                    .ok_or("Bad char index")?;
-                summary = summary[..char_idx].trim().to_string();
-            }
-
-            // FIXME empty summary gets this too somehow
-            // append ...
-            //summary.push_str(" ...");
-        }
-
-        self.word_header.summary = summary;
-
-        Ok(())
-    }
 }
 
 impl Default for DictWord {
@@ -351,6 +166,7 @@ impl Default for DictWordHeader {
             synonyms: Vec::new(),
             antonyms: Vec::new(),
             see_also: Vec::new(),
+            also_written_as: Vec::new(),
         }
     }
 }
diff --git a/src/ebook.rs b/src/ebook.rs
index 9b88989..152b300 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -1063,9 +1063,159 @@ impl Ebook {
         self.oebps_dir = None;
     }
 
+    pub fn process_also_written_as(&mut self) {
+        info!("process_also_written_as()");
+        // anūpanāhi(n)
+        // TODO anūpa(n)āhi(n)
+        let re_first_word = Regex::new(r"^ *([^ ]+)\((.)\)").unwrap();
+        // (also written as *aruṇugga*)
+        let re_also_written = Regex::new(r"\(also written as \**([^ ]+)\**\)").unwrap();
+
+        for (_, dict_word) in self.dict_words.iter_mut() {
+            //let word = dict_word.word_header.word.clone();
+            let mut s = dict_word.definition_md.trim().to_string();
+
+            // First word with parens indicating alternative form.
+
+            if let Some(caps) = re_first_word.captures(&s) {
+                let w = format!("{}{}", caps.get(1).unwrap().as_str(), caps.get(2).unwrap().as_str());
+                dict_word.word_header.also_written_as.push(w);
+                s = re_first_word.replace(&s, "").to_string().trim().to_string();
+            }
+
+            // (also written as...)
+
+            for cap in re_also_written.captures_iter(&s) {
+                dict_word.word_header.also_written_as.push(cap[1].to_string());
+            }
+
+            s = re_also_written.replace_all(&s, "").to_string();
+
+            dict_word.definition_md = s;
+        }
+
+        // TODO: variations in links and see also
+        // (also *anūpanāhi(n)*)
+        // (see *[upanāhi(n)](/define/upanāhi(n))*)
+        // (see *[upaparikkha(t)](/define/upaparikkha(t))*)
+        // [abhu(ṃ)](/define/abhu(ṃ))
+        //
+        // If an alternative form is mentioned in the definition_md:
+        // - find which form has an entry
+        // - if both forms have an entry, warn the user
+        // - merge the longer form into the shorter
+        // - add new form to inflections and also_written_as
+
+    }
+
+    pub fn process_strip_repeat_word_title(&mut self) {
+        info!("process_strip_repeat_word_title()");
+
+        for (_, dict_word) in self.dict_words.iter_mut() {
+            let word = dict_word.word_header.word.clone();
+            let mut s = dict_word.definition_md.trim().to_string();
+
+            // The simplest case, the whole word
+            // - abhijanat, abhikamin
+            // Don't match parens variations abhikami(n), which would leave only (n)
+            s = s.trim_start_matches(&format!("{}\n", word)).trim().to_string();
+
+            dict_word.definition_md = s;
+        }
+    }
+
+    pub fn process_grammar_note(&mut self) {
+        info!("process_grammar_note()");
+
+        // grammar abbr., with- or without dot, with- or without parens
+        let re_abbr_one = Regex::new(r"^[0-9 ]*\(*(d|f|m|ṃ|n|r|s|t)\.*\)*\.*\b").unwrap();
+        let re_abbr_two = Regex::new(r"^[0-9 ]*\(*(ac|fn|id|mf|pl|pp|pr|sg|si)\.*\)*\.*\b").unwrap();
+        let re_abbr_three = Regex::new(
+            r"^[0-9 ]*\(*(abl|acc|act|adv|aor|dat|fpp|fut|gen|inc|ind|inf|loc|mfn|neg|opt|par)\.*\)*\.*\b",
+        )
+            .unwrap();
+        let re_abbr_four = Regex::new(r"^[0-9 ]*\(*(caus|part|pass|pron)\.*\)*\.*\b").unwrap();
+        let re_abbr_more = Regex::new(r"^[0-9 ]*\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
+
+        // ~ā
+        let re_suffix_a = Regex::new(r"^\\*~*[aā],* +").unwrap();
+
+        for (_key, dict_word) in self.dict_words.iter_mut() {
+            let mut def = dict_word.definition_md.trim().to_string();
+
+            let max_iter = 10;
+            let mut n_iter = 0;
+
+            loop {
+                let mut s = def.clone();
+
+                // (?)
+                s = s.trim_start_matches("(?)").trim().to_string();
+                s = s.trim_start_matches("?)").trim().to_string();
+
+                // pp space
+                s = s.trim_start_matches("pp ").trim().to_string();
+                // abbr, start with longer patterns
+                s = re_abbr_more.replace(&s, "").trim().to_string();
+                s = re_abbr_four.replace(&s, "").trim().to_string();
+                s = re_abbr_three.replace(&s, "").trim().to_string();
+                s = re_abbr_two.replace(&s, "").trim().to_string();
+                s = re_abbr_one.replace(&s, "").trim().to_string();
+
+                // FIXME somehow the above sometimes leaves the closing paren and dot
+                s = s.trim_start_matches(')').trim().to_string();
+                s = s.trim_start_matches('.').trim().to_string();
+                s = s.trim_start_matches(';').trim().to_string();
+
+                // ~ā
+                s = re_suffix_a.replace(&s, "").to_string();
+                // (& m.)
+                s = s.trim_start_matches(r"(& m.)").trim().to_string();
+                s = s.trim_start_matches(r"(& f.)").trim().to_string();
+                s = s.trim_start_matches(r"(& n.)").trim().to_string();
+
+                // m(fn).
+                s = s.trim_start_matches("(& mfn.)").trim().to_string();
+                s = s.trim_start_matches("m(fn)").trim().to_string();
+                s = s.trim_start_matches('.').trim().to_string();
+
+                // m.a
+                s = s.trim_start_matches("m.a").trim().to_string();
+                // &
+                s = s.trim_start_matches('&').trim().to_string();
+                // fpp[.]
+                s = s.trim_start_matches("fpp[.]").trim().to_string();
+
+                n_iter += 1;
+
+                if s == def {
+                    // stop if there was no change
+                    break;
+                } else if n_iter == max_iter {
+                    // or we hit max_iter
+                    info!("max_iter reached: {}", s);
+                    def = s;
+                    break;
+                } else {
+                    // apply changes and loop again
+                    def = s;
+                }
+            }
+
+            dict_word.word_header.grammar = dict_word.definition_md
+                .trim_end_matches(&def)
+                .trim_end_matches(',')
+                .trim()
+                .to_string();
+            dict_word.definition_md = def;
+        }
+    }
+
     pub fn process_see_also_from_definition(&mut self) {
+        info!("process_see_also_from_definition()");
+
         // [abbha(t)](/define/abbha(t))
-        // [abhu(ṃ)](/define/abhu(ṃ)
+        // [abhu(ṃ)](/define/abhu(ṃ))
         // FIXME (n) (t)
         let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
         // We're going to temporarily replace links as [[abbha]]
@@ -1120,6 +1270,204 @@ impl Ebook {
             w.definition_md = def;
         }
     }
+
+    pub fn process_summary(&mut self) -> Result<(), Box<dyn Error>> {
+            let re_links = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
+            let re_spaces = Regex::new("  +").unwrap();
+            let re_chars = Regex::new(r"[\n\t<>]").unwrap();
+            let re_see_markdown_links = Regex::new(r"\(see \*\[([^\]]+)\]\([^\)]+\)\**\)").unwrap();
+            let re_markdown_links = Regex::new(r"\[([^\]]+)\]\([^\)]+\)").unwrap();
+            let re_markdown = Regex::new(r"[\*\[\]]").unwrap();
+
+            // Don't remove (see ...), so that one can look up the next word when noticing it in the
+            // search hits.
+
+            // (from|or|also ...)
+            let re_from = Regex::new(r"^\((from|or|also) +[^\)]+\)").unwrap();
+
+            // 1
+            // 1.
+            let re_num = Regex::new(r"^[0-9]\.*").unwrap();
+
+            // grammar abbr., with- or without dot, with- or without parens
+            let re_abbr_one = Regex::new(r"^\(*(d|f|m|ṃ|n|r|s|t)\.*\)*\.*\b").unwrap();
+            let re_abbr_two = Regex::new(r"^\(*(ac|fn|id|mf|pl|pp|pr|sg|si)\.*\)*\.*\b").unwrap();
+            let re_abbr_three = Regex::new(
+                r"^\(*(abl|acc|act|adv|aor|dat|fpp|fut|gen|inc|ind|inf|loc|mfn|neg|opt|par)\.*\)*\.*\b",
+            )
+                .unwrap();
+            let re_abbr_four = Regex::new(r"^\(*(caus|part|pass|pron)\.*\)*\.*\b").unwrap();
+            let re_abbr_more = Regex::new(r"^\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
+
+            // ~ā
+            let re_suffix_a = Regex::new(r"^\\*~*[aā],* +").unwrap();
+
+            // (~ontī)
+            // (-ikā)n.
+            let re_suffix = Regex::new(r"^\([~-][^\)]+\)\w*\.*").unwrap();
+
+            // agga-m-agga
+            // abhi-uggantvā
+            let re_hyphenated_twice = Regex::new(r"^\w+-\w+-\w+\b").unwrap();
+            let re_hyphenated_once = Regex::new(r"^\w+-\w+\b").unwrap();
+
+        for (_key, dict_word) in self.dict_words.iter_mut() {
+            if !dict_word.word_header.summary.is_empty() {
+                dict_word.word_header.summary = dict_word.word_header.summary.trim().to_string();
+            }
+
+            if !dict_word.word_header.summary.is_empty() {
+                return Ok(());
+            }
+
+            let mut summary = dict_word.definition_md.trim().to_string();
+
+            // strip links
+            summary = re_links.replace_all(&summary, "$1").to_string();
+
+            // newlines to space
+            summary = summary.replace("\n", " ");
+            // contract multiple spaces
+            summary = re_spaces.replace_all(&summary, " ").trim().to_string();
+
+            // remaining html tags
+            summary = summary.replace("<sup>", "");
+            summary = summary.replace("</sup>", "");
+            summary = summary.replace("<i>", "");
+            summary = summary.replace("</i>", "");
+            summary = summary.replace("<b>", "");
+            summary = summary.replace("</b>", "");
+
+            summary = re_chars.replace_all(&summary, " ").trim().to_string();
+
+            // slash escapes
+            // un\-angered -> un-angered
+            // un\\-angered -> un-angered
+            summary = summary.replace(r"\\", "");
+            summary = summary.replace(r"\", "");
+
+            // See... with markdown link
+            // (see *[abbha](/define/abbha)*) -> (see abbha)
+            summary = re_see_markdown_links
+                .replace_all(&summary, "(see $1)")
+                .trim()
+                .to_string();
+
+            // markdown links
+            // [abbha](/define/abbha) -> abbha
+            summary = re_markdown_links
+                .replace_all(&summary, "$1")
+                .trim()
+                .to_string();
+
+            // remaining markdown markup: *, []
+            summary = re_markdown.replace_all(&summary, "").trim().to_string();
+
+            let word = dict_word.word_header.word.clone();
+
+            let max_iter = 10;
+            let mut n_iter = 0;
+
+            loop {
+                // the whole word
+                // abhijanat, abhikamin
+                let mut s = summary.trim_start_matches(&word).trim().to_string();
+
+                // part of the word
+                // abhijana(t)
+                // abhikami(n)
+                let (char_idx, _char) = word.char_indices().last().unwrap();
+                let w = word[..char_idx].to_string();
+                s = s.trim_start_matches(&w).trim().to_string();
+
+                s = re_hyphenated_twice.replace(&s, "").trim().to_string();
+                s = re_hyphenated_once.replace(&s, "").trim().to_string();
+
+                s = re_num.replace(&s, "").trim().to_string();
+                s = re_suffix.replace(&s, "").trim().to_string();
+
+                s = re_from.replace(&s, "").trim().to_string();
+
+                s = s.trim_start_matches('.').trim().to_string();
+                s = s.trim_start_matches(',').trim().to_string();
+                s = s.trim_start_matches('-').trim().to_string();
+
+                // (?)
+                s = s.trim_start_matches("(?)").trim().to_string();
+                s = s.trim_start_matches("?)").trim().to_string();
+
+                // pp space
+                s = s.trim_start_matches("pp ").trim().to_string();
+                // abbr, start with longer patterns
+                s = re_abbr_more.replace(&s, "").trim().to_string();
+                s = re_abbr_four.replace(&s, "").trim().to_string();
+                s = re_abbr_three.replace(&s, "").trim().to_string();
+                s = re_abbr_two.replace(&s, "").trim().to_string();
+                s = re_abbr_one.replace(&s, "").trim().to_string();
+
+                // FIXME somehow the above sometimes leaves the closing paren and dot
+                s = s.trim_start_matches(')').trim().to_string();
+                s = s.trim_start_matches('.').trim().to_string();
+                s = s.trim_start_matches(';').trim().to_string();
+
+                // ~ā
+                s = re_suffix_a.replace(&s, "").to_string();
+                // (& m.)
+                s = s.trim_start_matches(r"(& m.)").trim().to_string();
+                s = s.trim_start_matches(r"(& f.)").trim().to_string();
+                s = s.trim_start_matches(r"(& n.)").trim().to_string();
+
+                // m(fn).
+                s = s.trim_start_matches("(& mfn.)").trim().to_string();
+                s = s.trim_start_matches("m(fn)").trim().to_string();
+                s = s.trim_start_matches('.').trim().to_string();
+
+                // m.a
+                s = s.trim_start_matches("m.a").trim().to_string();
+                // &
+                s = s.trim_start_matches('&').trim().to_string();
+                // fpp[.]
+                s = s.trim_start_matches("fpp[.]").trim().to_string();
+
+                n_iter += 1;
+
+                if s == summary {
+                    // stop if there was no change
+                    break;
+                } else if n_iter == max_iter {
+                    // or we hit max_iter
+                    info!("max_iter reached: {}", s);
+                    summary = s;
+                    break;
+                } else {
+                    // apply changes and loop again
+                    summary = s;
+                }
+            }
+
+            // cap the length of the final summary
+
+            if !summary.is_empty() {
+                let sum_length = 50;
+                if summary.char_indices().count() > sum_length {
+                    let (char_idx, _char) = summary
+                        .char_indices()
+                        .nth(sum_length)
+                        .ok_or("Bad char index")?;
+                    summary = summary[..char_idx].trim().to_string();
+                }
+
+                // FIXME empty summary gets this too somehow
+                // append ...
+                //summary.push_str(" ...");
+            }
+
+            dict_word.word_header.summary = summary;
+
+        }
+
+        Ok(())
+    }
 }
 
 fn reg_tmpl(h: &mut Handlebars, k: &str, afs: &BTreeMap<String, String>) {
diff --git a/src/main.rs b/src/main.rs
index 6d99f69..1248bed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -93,11 +93,11 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_also_written_as();
+            ebook.process_strip_repeat_word_title();
+            ebook.process_grammar_note();
             ebook.process_see_also_from_definition();
-
-            for (_key, word) in ebook.dict_words.iter_mut() {
-                ok_or_exit(app_params.used_first_arg, word.clean_summary());
-            }
+            ok_or_exit(app_params.used_first_arg, ebook.process_summary());
 
             ok_or_exit(app_params.used_first_arg, ebook.write_markdown());
         }
@@ -115,9 +115,7 @@ fn main() {
                 &mut ebook,
             );
 
-            for (_key, word) in ebook.dict_words.iter_mut() {
-                ok_or_exit(app_params.used_first_arg, word.clean_summary());
-            }
+            ok_or_exit(app_params.used_first_arg, ebook.process_summary());
 
             info!("Added words: {}", ebook.len());
 
diff --git a/tests/data/grammar_note/grammar_note.md b/tests/data/grammar_note/grammar_note.md
new file mode 100644
index 0000000..c9326b4
--- /dev/null
+++ b/tests/data/grammar_note/grammar_note.md
@@ -0,0 +1,661 @@
+--- DICTIONARY METADATA ---
+
+``` toml
+title = "Dictionary"
+```
+
+--- DICTIONARY WORD ENTRIES ---
+
+``` toml
+dict_label = "NCPED"
+word = "āsaṅkamāna"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asankamana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsaṅkamāna
+
+part. pr. mfn. (see *[āsaṅkati](/define/āsaṅkati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsaṅkati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asankati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsaṅkati
+
+pr. 3 sg. suspects; distrusts; fears.
+
+``` toml
+dict_label = "NCPED"
+word = "āseva"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["aseva"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āseva(t)
+
+part. pr. mfn. (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsevamāna"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevamana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevamāna
+
+part. pr. mfn. (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsevanta"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevanta"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevanta
+
+part. pr. mfn. (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsevanā"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevanā
+
+feminine \~a, neuter assiduous practice; habitual cultivation.
+
+``` toml
+dict_label = "NCPED"
+word = "āsevat"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevat"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āseva(t)
+
+part. pr. mfn. (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsevati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevati
+
+pr. 3 sg. attends to, practises, cultivates; indulges in.
+
+``` toml
+dict_label = "NCPED"
+word = "āsevita"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevita"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevita
+
+pp mfn. practiced; cultivated (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsevitabba"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevitabba"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsevitabba
+
+fpp mfn. (see *[āsevita](/define/āsevita)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āseviṃ"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asevim"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āseviṃ
+
+aor. 1 sg. (see *[āsevati](/define/āsevati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asincati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiñcati
+
+pr. 3 sg. (trans.) pours on or into; showers over; be\-sprinkles, wets.
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñci"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asinci"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiñci
+
+aor. 3 sg. (see *[āsiñcati](/define/āsiñcati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcitabba"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asincitabba"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiñcitabba
+
+fpp mfn. (see *[āsiñcati](/define/āsiñcati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcitvā"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asincitva"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiñcitvā
+
+absol. having poured on or into; dripped (see *[āsiñcati](/define/āsiñcati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃ"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asim"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃ
+
+1 sg. (see *[atthi](/define/atthi)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsa"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asimsa"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃsa(t)
+
+part. pr. mfn. (see *[āsiṃsati](/define/āsiṃsati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsamāna"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asimsamana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃsamāna
+
+par. pr. mfn. (see *[āsiṃsati](/define/āsiṃsati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsat"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asimsat"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃsa(t)
+
+part. pr. mfn. (see *[āsiṃsati](/define/āsiṃsati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asimsati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃsati
+
+pr. 3 sg. hopes for; desires.
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsāpeti"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asimsapeti"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsiṃsāpeti
+
+caus. pr. 3 sg. (see *[āsiṃsati](/define/āsiṃsati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsumbhati
+
+pr. 3 sg. lets fall, drops; throws down (see also *[āsumhati](/define/āsumhati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhitvā"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhitva"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsumbhitvā
+
+absol. (see *[āsumbhati](/define/āsumbhati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhiṃsu"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhimsu"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsumbhiṃsu
+
+3 plural (see *[āsumbhati](/define/āsumbhati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsumhati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asumhati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsumhati
+
+pr. 3 sg. lets fall, drops; throws down (see also *[āsumbhati](/define/āsumbhati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsuṃ"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asum"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsuṃ
+
+3 plural (see *[atthi](/define/atthi)*)
+
+``` toml
+dict_label = "NCPED"
+word = "āsā"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asa"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsā
+
+feminine wish, hope, expectation.
+
+``` toml
+dict_label = "NCPED"
+word = "āsādana"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["asadana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+āsādana
+
+neuter ā, feminine insult, offensiveness.
+
+``` toml
+dict_label = "NCPED"
+word = "kupita"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kupita
+
+pp mfn. (occasionally also written as kuppita) agitated, disturbed; in a state of unrest; provoked, angry; failed, invalid (see *[kuppati](/define/kuppati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "kuppa"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuppa
+
+fpp mfn.
+
+1. (mfn.) able to be disturbed; unstable; open to challenge or valid objection.
+2. (n.) disturbance (see *[kuppati](/define/kuppati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "kuppaniya"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuppaniya
+
+mfn. tending to make angry; (that) which disturbs.
+
+``` toml
+dict_label = "NCPED"
+word = "kuppati"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuppati
+
+pr. 3 sg.
+
+1. is agitated (with emotion or anger); is disturbed; is in a state of unrest; is angry (with, acc. or gen./dat.).
+2. is disturbed, falters; fails in effect, is invalid.
+
+``` toml
+dict_label = "NCPED"
+word = "kuppi"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuppi
+
+aor.3 sg. (see *[kuppati](/define/kuppati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "kuppita"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuppita
+
+pp mfn. (another way of writing kupita) agitated, disturbed; in a state of unrest; provoked, angry; failed, invalid (see *[kuppati](/define/kuppati)*)
+
+``` toml
+dict_label = "NCPED"
+word = "kuramaṃsa"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["kuramamsa"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kuramaṃsa
+
+neuter boiled rice and meat.
+
+``` toml
+dict_label = "NCPED"
+word = "kurumāna"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["kurumana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+kurumāna
+
+part. pr. mfn. (see *[kurute](/define/kurute)*)
diff --git a/tests/data/grammar_note/grammar_note_expect.md b/tests/data/grammar_note/grammar_note_expect.md
new file mode 100644
index 0000000..7178dd3
--- /dev/null
+++ b/tests/data/grammar_note/grammar_note_expect.md
@@ -0,0 +1,577 @@
+``` toml
+dict_label = "NCPED"
+word = "kupita"
+summary = ""
+grammar = "pp mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["kuppati"]
+also_written_as = []
+```
+
+(occasionally also written as kuppita) agitated, disturbed; in a state of unrest; provoked, angry; failed, invalid
+
+``` toml
+dict_label = "NCPED"
+word = "kuppa"
+summary = ""
+grammar = "fpp mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["kuppati"]
+also_written_as = []
+```
+
+1. (mfn.) able to be disturbed; unstable; open to challenge or valid objection.
+2. (n.) disturbance
+
+``` toml
+dict_label = "NCPED"
+word = "kuppaniya"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+tending to make angry; (that) which disturbs.
+
+``` toml
+dict_label = "NCPED"
+word = "kuppati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+1. is agitated (with emotion or anger); is disturbed; is in a state of unrest; is angry (with, acc. or gen./dat.).
+2. is disturbed, falters; fails in effect, is invalid.
+
+``` toml
+dict_label = "NCPED"
+word = "kuppi"
+summary = ""
+grammar = "aor.3 sg."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["kuppati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "kuppita"
+summary = ""
+grammar = "pp mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["kuppati"]
+also_written_as = []
+```
+
+(another way of writing kupita) agitated, disturbed; in a state of unrest; provoked, angry; failed, invalid
+
+``` toml
+dict_label = "NCPED"
+word = "kuramaṃsa"
+summary = ""
+grammar = "neuter"
+phonetic = ""
+transliteration = ""
+inflections = ["kuramamsa"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+boiled rice and meat.
+
+``` toml
+dict_label = "NCPED"
+word = "kurumāna"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["kurumana"]
+synonyms = []
+antonyms = []
+see_also = ["kurute"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsaṅkamāna"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asankamana"]
+synonyms = []
+antonyms = []
+see_also = ["āsaṅkati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsaṅkati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asankati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+suspects; distrusts; fears.
+
+``` toml
+dict_label = "NCPED"
+word = "āseva"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["aseva"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = ["āsevat"]
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsevamāna"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asevamana"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsevanta"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asevanta"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsevanā"
+summary = ""
+grammar = "feminine \\~a, neuter"
+phonetic = ""
+transliteration = ""
+inflections = ["asevana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+assiduous practice; habitual cultivation.
+
+``` toml
+dict_label = "NCPED"
+word = "āsevat"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asevat"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = ["āsevat"]
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsevati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asevati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+attends to, practises, cultivates; indulges in.
+
+``` toml
+dict_label = "NCPED"
+word = "āsevita"
+summary = ""
+grammar = "pp mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asevita"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = []
+```
+
+practiced; cultivated
+
+``` toml
+dict_label = "NCPED"
+word = "āsevitabba"
+summary = ""
+grammar = "fpp mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asevitabba"]
+synonyms = []
+antonyms = []
+see_also = ["āsevita"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āseviṃ"
+summary = ""
+grammar = "aor. 1 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asevim"]
+synonyms = []
+antonyms = []
+see_also = ["āsevati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcati"
+summary = ""
+grammar = "pr. 3 sg. (trans.)"
+phonetic = ""
+transliteration = ""
+inflections = ["asincati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+pours on or into; showers over; be\-sprinkles, wets.
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñci"
+summary = ""
+grammar = "aor. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asinci"]
+synonyms = []
+antonyms = []
+see_also = ["āsiñcati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcitabba"
+summary = ""
+grammar = "fpp mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asincitabba"]
+synonyms = []
+antonyms = []
+see_also = ["āsiñcati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiñcitvā"
+summary = ""
+grammar = "absol."
+phonetic = ""
+transliteration = ""
+inflections = ["asincitva"]
+synonyms = []
+antonyms = []
+see_also = ["āsiñcati"]
+also_written_as = []
+```
+
+having poured on or into; dripped
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃ"
+summary = ""
+grammar = "1 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asim"]
+synonyms = []
+antonyms = []
+see_also = ["atthi"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsa"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asimsa"]
+synonyms = []
+antonyms = []
+see_also = ["āsiṃsati"]
+also_written_as = ["āsiṃsat"]
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsamāna"
+summary = ""
+grammar = "par. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asimsamana"]
+synonyms = []
+antonyms = []
+see_also = ["āsiṃsati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsat"
+summary = ""
+grammar = "part. pr. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["asimsat"]
+synonyms = []
+antonyms = []
+see_also = ["āsiṃsati"]
+also_written_as = ["āsiṃsat"]
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asimsati"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+hopes for; desires.
+
+``` toml
+dict_label = "NCPED"
+word = "āsiṃsāpeti"
+summary = ""
+grammar = "caus. pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asimsapeti"]
+synonyms = []
+antonyms = []
+see_also = ["āsiṃsati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhati"]
+synonyms = []
+antonyms = []
+see_also = ["āsumhati"]
+also_written_as = []
+```
+
+lets fall, drops; throws down
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhitvā"
+summary = ""
+grammar = "absol."
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhitva"]
+synonyms = []
+antonyms = []
+see_also = ["āsumbhati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsumbhiṃsu"
+summary = ""
+grammar = "3 plural"
+phonetic = ""
+transliteration = ""
+inflections = ["asumbhimsu"]
+synonyms = []
+antonyms = []
+see_also = ["āsumbhati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsumhati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = ["asumhati"]
+synonyms = []
+antonyms = []
+see_also = ["āsumbhati"]
+also_written_as = []
+```
+
+lets fall, drops; throws down
+
+``` toml
+dict_label = "NCPED"
+word = "āsuṃ"
+summary = ""
+grammar = "3 plural"
+phonetic = ""
+transliteration = ""
+inflections = ["asum"]
+synonyms = []
+antonyms = []
+see_also = ["atthi"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "āsā"
+summary = ""
+grammar = "feminine"
+phonetic = ""
+transliteration = ""
+inflections = ["asa"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+wish, hope, expectation.
+
+``` toml
+dict_label = "NCPED"
+word = "āsādana"
+summary = ""
+grammar = "neuter ā, feminine"
+phonetic = ""
+transliteration = ""
+inflections = ["asadana"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+insult, offensiveness.
\ No newline at end of file
diff --git a/tests/see_also.rs b/tests/processing_from_definition.rs
similarity index 63%
rename from tests/see_also.rs
rename to tests/processing_from_definition.rs
index 748a0d3..44cb482 100644
--- a/tests/see_also.rs
+++ b/tests/processing_from_definition.rs
@@ -45,3 +45,26 @@ fn see_also_from_definition_parens() {
     assert_eq!(res, expect);
 }
 */
+
+#[test]
+fn grammar_note() {
+    let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
+
+    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/grammar_note/grammar_note.md")];
+
+    app::process_markdown_list(sources, &mut ebook).unwrap();
+
+    ebook.process_also_written_as();
+    ebook.process_strip_repeat_word_title();
+    ebook.process_grammar_note();
+    ebook.process_see_also_from_definition();
+
+    let res = ebook.entries_as_markdown();
+    //let mut file = File::create(&PathBuf::from("./tests/data/grammar_note/grammar_note_expect.md")).unwrap();
+    //file.write_all(res.as_bytes()).unwrap();
+    //let expect = "".to_string();
+
+    let expect = fs::read_to_string(&PathBuf::from("./tests/data/grammar_note/grammar_note_expect.md")).unwrap();
+
+    assert_eq!(res, expect);
+}

From 415db2e5dc963a2a6abf49a9422e380d87dd4710 Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Fri, 15 Nov 2019 05:08:03 +0000
Subject: [PATCH 06/10] render it

---
 assets/OEBPS/entries-epub.xhtml | 22 ++++------------------
 assets/OEBPS/entries-mobi.xhtml | 22 ++++------------------
 assets/stardict_textual.xml     |  1 +
 src/ebook.rs                    | 18 ++++++++++++++----
 src/helpers.rs                  | 12 ++++++++----
 5 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/assets/OEBPS/entries-epub.xhtml b/assets/OEBPS/entries-epub.xhtml
index 0a67f29..36c4a2b 100644
--- a/assets/OEBPS/entries-epub.xhtml
+++ b/assets/OEBPS/entries-epub.xhtml
@@ -14,24 +14,10 @@
 <p>{{word_header.summary}}</p>
 {{/if ~}}
 
+{{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md}}
-
-{{#if word_header.synonyms}}
-<p>Synonyms:</p>
-<ul>
-{{#each word_header.synonyms}}
-<li>{{this}}</li>
-{{/each}}
-</ul>
-{{/if}}
-
-{{#if word_header.antonyms}}
-<p>Antonyms:</p>
-<ul>
-{{#each word_header.antonyms}}
-<li>{{this}}</li>
-{{/each}}
-</ul>
-{{/if}}
+{{word_list "Synonyms:" word_header.synonyms ~}}
+{{word_list "Antonyms:" word_header.antonyms ~}}
+{{word_list "See also:" word_header.see_also ~}}
 
 {{/each}}
diff --git a/assets/OEBPS/entries-mobi.xhtml b/assets/OEBPS/entries-mobi.xhtml
index 8d136f5..292cd0b 100644
--- a/assets/OEBPS/entries-mobi.xhtml
+++ b/assets/OEBPS/entries-mobi.xhtml
@@ -9,24 +9,10 @@
 {{#each group.dict_words}}
 <idx:entry><idx:orth><h4>{{word_header.word}}</h4>{{grammar_phonetic_transliteration word_header ../meta.use_velthuis ~}}<p>{{#if word_header.dict_label}} <i>{{word_header.dict_label}}</i>{{/if}}{{#if word_header.summary}} <i>{{word_header.summary}}</i>{{/if}}{{#if word_header.inflections}}</p><idx:infl>{{#each word_header.inflections}} <idx:iform value="{{this}}"/>{{/each}}</idx:infl>{{/if}}</idx:orth></idx:entry>
 
+{{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md}}
-
-{{#if word_header.synonyms}}
-<p>Synonyms:</p>
-<ul>
-{{#each word_header.synonyms}}
-<li>{{this}}</li>
-{{/each}}
-</ul>
-{{/if}}
-
-{{#if word_header.antonyms}}
-<p>Antonyms:</p>
-<ul>
-{{#each word_header.antonyms}}
-<li>{{this}}</li>
-{{/each}}
-</ul>
-{{/if}}
+{{word_list "Synonyms:" word_header.synonyms ~}}
+{{word_list "Antonyms:" word_header.antonyms ~}}
+{{word_list "See also:" word_header.see_also ~}}
 
 {{/each}}
diff --git a/assets/stardict_textual.xml b/assets/stardict_textual.xml
index 86ed08d..dcb4881 100644
--- a/assets/stardict_textual.xml
+++ b/assets/stardict_textual.xml
@@ -26,6 +26,7 @@
       <definition type="h">
         <![CDATA[
 {{grammar_phonetic_transliteration word_header ../meta.use_velthuis ~}}
+{{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md ~}}
 {{word_list "Synonyms:" word_header.synonyms ~}}
 {{word_list "Antonyms:" word_header.antonyms ~}}
diff --git a/src/ebook.rs b/src/ebook.rs
index 152b300..82469c6 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -982,10 +982,20 @@ impl Ebook {
 
             text.push_str(&s);
 
-            // definition
+            // Also written as
+            if !word.word_header.also_written_as.is_empty() {
+                let s: String = word.word_header.also_written_as.iter()
+                    .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
+                    .collect::<Vec<String>>()
+                    .join(", ");
+
+                text.push_str(&format!("<p>Also written as: {}</p>", &s));
+            }
+
+            // Definition
             text.push_str(&helpers::md2html(&word.definition_md));
 
-            // synonyms
+            // Synonyms
             if !word.word_header.synonyms.is_empty() {
                 let s: String = word.word_header.synonyms.iter()
                     .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
@@ -995,7 +1005,7 @@ impl Ebook {
                 text.push_str(&format!("<p>Synonyms: {}</p>", &s));
             }
 
-            // antonyms
+            // Antonyms
             if !word.word_header.antonyms.is_empty() {
                 let s: String = word.word_header.antonyms.iter()
                     .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
@@ -1005,7 +1015,7 @@ impl Ebook {
                 text.push_str(&format!("<p>Antonyms: {}</p>", &s));
             }
 
-            // see also
+            // See also
             if !word.word_header.see_also.is_empty() {
                 let s: String = word.word_header.see_also.iter()
                     .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
diff --git a/src/helpers.rs b/src/helpers.rs
index cf016ac..461d82c 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -81,23 +81,27 @@ pub fn format_grammar_phonetic_transliteration(
     let g = if grammar.is_empty() {
         "".to_string()
     } else {
-        format!("<i style=\"color: green;\">{}</i>", grammar)
+        // grass green
+        format!("<i style=\"color: #448C19;\">{}</i>", grammar)
     };
 
     let ph = if phonetic.is_empty() {
         "".to_string()
     } else {
-        format!(" <span>[{}]</span>", phonetic)
+        // dark ocean blue
+        format!(" | <span style=\"color: #0B4A72;\">{}</span>", phonetic)
     };
 
     let tr = if transliteration.is_empty() {
         if use_velthuis {
-            format!(" <span>({})</span>", pali::to_velthuis(&word))
+            // dark ocean blue
+            format!(" | <span style=\"color: #0B4A72;\">{}</span>", pali::to_velthuis(&word))
         } else {
             "".to_string()
         }
     } else {
-        format!(" <span>({})</span>", transliteration)
+        // dark ocean blue
+        format!(" | <span style=\"color: #0B4A72;\">{}</span>", transliteration)
     };
 
     format!("<p>{}{}{}</p>", g, ph, tr)

From bcbaa0eda959db6dbf2466be033dcc351c70f7aa Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Fri, 15 Nov 2019 15:45:22 +0000
Subject: [PATCH 07/10] processing

---
 src/app.rs                                    |  10 +
 src/cli.yml                                   |   6 +
 src/ebook.rs                                  | 175 +++++++++---
 src/helpers.rs                                |   2 +-
 src/main.rs                                   |  21 +-
 .../processing.md}                            | 122 +++++++++
 .../processing_expect.md}                     | 256 ++++++++++++++++++
 tests/data/see_also/see_also_parens.md        |  55 ----
 tests/data/see_also/see_also_parens_expect.md |   0
 tests/data/see_also/see_also_simple.md        |  64 -----
 tests/data/see_also/see_also_simple_expect.md | 136 ----------
 tests/processing_from_definition.rs           |  46 +---
 12 files changed, 558 insertions(+), 335 deletions(-)
 rename tests/data/{grammar_note/grammar_note.md => processing/processing.md} (82%)
 rename tests/data/{grammar_note/grammar_note_expect.md => processing/processing_expect.md} (68%)
 delete mode 100644 tests/data/see_also/see_also_parens.md
 delete mode 100644 tests/data/see_also/see_also_parens_expect.md
 delete mode 100644 tests/data/see_also/see_also_simple.md
 delete mode 100644 tests/data/see_also/see_also_simple_expect.md

diff --git a/src/app.rs b/src/app.rs
index 9802a01..6811125 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -28,6 +28,7 @@ pub struct AppStartParams {
     pub dict_label: Option<String>,
     pub dont_run_kindlegen: bool,
     pub dont_remove_generated_files: bool,
+    pub dont_process: bool,
     pub run_command: RunCommand,
     pub show_logs: bool,
     pub zip_with: ZipWith,
@@ -80,6 +81,7 @@ impl Default for AppStartParams {
             mobi_compression: 0,
             dont_run_kindlegen: false,
             dont_remove_generated_files: false,
+            dont_process: false,
             run_command: RunCommand::NoOp,
             show_logs: false,
             zip_with,
@@ -367,6 +369,8 @@ fn process_to_babylon(
     run_command: RunCommand)
     -> Result<(), Box<dyn Error>>
 {
+    params.output_format = OutputFormat::BabylonGls;
+
     if !sub_matches.is_present("source_path")
         && !sub_matches.is_present("source_paths_list")
     {
@@ -467,6 +471,8 @@ fn process_to_stardict(
     run_command: RunCommand)
     -> Result<(), Box<dyn Error>>
 {
+    params.output_format = OutputFormat::StardictXml;
+
     if !sub_matches.is_present("source_path")
         && !sub_matches.is_present("source_paths_list")
     {
@@ -591,6 +597,10 @@ pub fn process_cli_args(matches: clap::ArgMatches) -> Result<AppStartParams, Box
             params.dict_label = Some(x);
         }
 
+        if sub_matches.is_present("dont_process") {
+            params.dont_process = true;
+        }
+
         params.run_command = RunCommand::SuttaCentralJsonToMarkdown;
 
     } else if let Some(sub_matches) = matches.subcommand_matches("nyanatiloka_to_markdown") {
diff --git a/src/cli.yml b/src/cli.yml
index 24726c5..e03ca23 100644
--- a/src/cli.yml
+++ b/src/cli.yml
@@ -369,6 +369,12 @@ subcommands:
             required: true
             takes_value: true
 
+        - dont_process:
+            help: "Don't process the definition into attributes."
+            long: dont_process
+            required: false
+            takes_value: false
+
   - nyanatiloka_to_markdown:
       about: "Process Ven. Nyanatiloka's Buddhist Dictionary and write a Markdown file with TOML headers."
 
diff --git a/src/ebook.rs b/src/ebook.rs
index 82469c6..a98a4c3 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -25,7 +25,13 @@ pub const DICTIONARY_WORD_ENTRIES_SEP: &str = "--- DICTIONARY WORD ENTRIES ---";
 pub struct Ebook {
     pub meta: EbookMetadata,
     pub output_format: OutputFormat,
+
     pub dict_words: BTreeMap<String, DictWord>,
+
+    /// Collects the list of valid word names which can be linked to.
+    #[serde(skip)]
+    pub valid_words: Vec<String>,
+
     pub entries_manifest: Vec<EntriesManifest>,
     pub asset_files_string: BTreeMap<String, String>,
     pub asset_files_byte: BTreeMap<String, Vec<u8>>,
@@ -215,6 +221,7 @@ impl Ebook {
             meta: EbookMetadata::default(),
             output_format,
             dict_words: BTreeMap::new(),
+            valid_words: Vec::new(),
             entries_manifest: Vec::new(),
             asset_files_string: afs,
             asset_files_byte: afb,
@@ -268,6 +275,10 @@ impl Ebook {
             }
         }
 
+        if !self.valid_words.contains(&new_word.word_header.word) {
+            self.valid_words.push(new_word.word_header.word.clone());
+        }
+
         if self.dict_words.contains_key(&w_key) {
             warn!(
                 "Double word: '{}'. Entries should be unique for word within one dictionary.",
@@ -984,11 +995,7 @@ impl Ebook {
 
             // Also written as
             if !word.word_header.also_written_as.is_empty() {
-                let s: String = word.word_header.also_written_as.iter()
-                    .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
-                    .collect::<Vec<String>>()
-                    .join(", ");
-
+                let s: String = word.word_header.also_written_as.join(", ");
                 text.push_str(&format!("<p>Also written as: {}</p>", &s));
             }
 
@@ -997,31 +1004,19 @@ impl Ebook {
 
             // Synonyms
             if !word.word_header.synonyms.is_empty() {
-                let s: String = word.word_header.synonyms.iter()
-                    .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
-                    .collect::<Vec<String>>()
-                    .join(", ");
-
+                let s: String = word.word_header.synonyms.join(", ");
                 text.push_str(&format!("<p>Synonyms: {}</p>", &s));
             }
 
             // Antonyms
             if !word.word_header.antonyms.is_empty() {
-                let s: String = word.word_header.antonyms.iter()
-                    .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
-                    .collect::<Vec<String>>()
-                    .join(", ");
-
+                let s: String = word.word_header.antonyms.join(", ");
                 text.push_str(&format!("<p>Antonyms: {}</p>", &s));
             }
 
             // See also
             if !word.word_header.see_also.is_empty() {
-                let s: String = word.word_header.see_also.iter()
-                    .map(|i| format!("<a href=\"bword://{}\">{}</a>", i, i))
-                    .collect::<Vec<String>>()
-                    .join(", ");
-
+                let s: String = word.word_header.see_also.join(", ");
                 text.push_str(&format!("<p>See also: {}</p>", &s));
             }
 
@@ -1073,13 +1068,39 @@ impl Ebook {
         self.oebps_dir = None;
     }
 
+    pub fn process_tidy(&mut self) {
+        info!("process_tidy()");
+
+        // (see *[*kaṭhina*](/define/<i>kaṭhina</i>)*)
+        let re_italic_html = Regex::new(r"<i>([^<]+)</i>").unwrap();
+        // (see also *[kathīka (?)](/define/kathīka (?))*)
+        let re_define_question = Regex::new(r"\[[^\]]+\]\(/define/([^\(\) ]+) *\(\?\)\)").unwrap();
+        // (see also *[kubbati, ](/define/kubbati, )* and *[kurute](/define/kurute)*)
+        let re_define_comma = Regex::new(r"\[[^\]]+\]\(/define/([^\(\), ]+), *\)").unwrap();
+
+        for (_, dict_word) in self.dict_words.iter_mut() {
+            let mut s = dict_word.definition_md.clone();
+
+            s = re_italic_html.replace_all(&s, "$1").to_string();
+            s = re_define_question.replace_all(&s, "[$1](/define/$1)").to_string();
+            s = re_define_comma.replace_all(&s, "[$1](/define/$1),").to_string();
+
+            dict_word.definition_md = s;
+        }
+
+    }
+
     pub fn process_also_written_as(&mut self) {
         info!("process_also_written_as()");
+        // anūpa(n)āhi(n)
+        let re_first_word_parens_mid_end = Regex::new(r"^ *([^ \n]+)\((.)\)([^ \n]+)\((.)\)").unwrap();
+        // anūpa(n)āhin
+        let re_first_word_parens_mid = Regex::new(r"^ *([^ \n]+)\((.)\)([^ \n]+)").unwrap();
         // anūpanāhi(n)
-        // TODO anūpa(n)āhi(n)
-        let re_first_word = Regex::new(r"^ *([^ ]+)\((.)\)").unwrap();
+        let re_first_word_parens_end = Regex::new(r"^ *([^ \n]+)\((.)\)").unwrap();
         // (also written as *aruṇugga*)
-        let re_also_written = Regex::new(r"\(also written as \**([^ ]+)\**\)").unwrap();
+        let re_also_written_ital = Regex::new(r"\(also written as \*([^ ]+)\*\)").unwrap();
+        let re_also_written_plain = Regex::new(r"\(also written as *([^ ]+)\)").unwrap();
 
         for (_, dict_word) in self.dict_words.iter_mut() {
             //let word = dict_word.word_header.word.clone();
@@ -1087,19 +1108,44 @@ impl Ebook {
 
             // First word with parens indicating alternative form.
 
-            if let Some(caps) = re_first_word.captures(&s) {
-                let w = format!("{}{}", caps.get(1).unwrap().as_str(), caps.get(2).unwrap().as_str());
+            if let Some(caps) = re_first_word_parens_mid_end.captures(&s) {
+                let w = format!("{}{}{}{}",
+                    caps.get(1).unwrap().as_str(),
+                    caps.get(2).unwrap().as_str(),
+                    caps.get(3).unwrap().as_str(),
+                    caps.get(4).unwrap().as_str());
                 dict_word.word_header.also_written_as.push(w);
-                s = re_first_word.replace(&s, "").to_string().trim().to_string();
+                s = re_first_word_parens_mid_end.replace(&s, "").to_string().trim().to_string();
+            }
+
+            if let Some(caps) = re_first_word_parens_mid.captures(&s) {
+                let w = format!("{}{}{}",
+                    caps.get(1).unwrap().as_str(),
+                    caps.get(2).unwrap().as_str(),
+                    caps.get(3).unwrap().as_str());
+                dict_word.word_header.also_written_as.push(w);
+                s = re_first_word_parens_mid.replace(&s, "").to_string().trim().to_string();
+            }
+
+            if let Some(caps) = re_first_word_parens_end.captures(&s) {
+                let w = format!("{}{}",
+                    caps.get(1).unwrap().as_str(),
+                    caps.get(2).unwrap().as_str());
+                dict_word.word_header.also_written_as.push(w);
+                s = re_first_word_parens_end.replace(&s, "").to_string().trim().to_string();
             }
 
             // (also written as...)
 
-            for cap in re_also_written.captures_iter(&s) {
+            for cap in re_also_written_ital.captures_iter(&s) {
                 dict_word.word_header.also_written_as.push(cap[1].to_string());
             }
+            s = re_also_written_ital.replace_all(&s, "").to_string();
 
-            s = re_also_written.replace_all(&s, "").to_string();
+            for cap in re_also_written_plain.captures_iter(&s) {
+                dict_word.word_header.also_written_as.push(cap[1].to_string());
+            }
+            s = re_also_written_plain.replace_all(&s, "").to_string();
 
             dict_word.definition_md = s;
         }
@@ -1145,7 +1191,7 @@ impl Ebook {
         )
             .unwrap();
         let re_abbr_four = Regex::new(r"^[0-9 ]*\(*(caus|part|pass|pron)\.*\)*\.*\b").unwrap();
-        let re_abbr_more = Regex::new(r"^[0-9 ]*\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
+        let re_abbr_more = Regex::new(r"^[0-9 ]*\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|metaph|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
 
         // ~ā
         let re_suffix_a = Regex::new(r"^\\*~*[aā],* +").unwrap();
@@ -1224,9 +1270,13 @@ impl Ebook {
     pub fn process_see_also_from_definition(&mut self) {
         info!("process_see_also_from_definition()");
 
-        // [abbha(t)](/define/abbha(t))
+        // [ab(b)ha(t)](/define/ab(b)ha(t))
+        let re_define_parens_mid_end = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\((.)\)([^\(\)]+)\((.)\)\)").unwrap();
+        // [ab(b)hat](/define/ab(b)hat)
+        let re_define_parens_mid = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\((.)\)([^\(\)]+)\)").unwrap();
         // [abhu(ṃ)](/define/abhu(ṃ))
-        // FIXME (n) (t)
+        let re_define_parens_end = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\((.)\)\)").unwrap();
+        // [abhuṃ](/define/abhuṃ)
         let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
         // We're going to temporarily replace links as [[abbha]]
         let re_bracket_links = Regex::new(r"\[\[([^]]+)\]\]").unwrap();
@@ -1266,11 +1316,29 @@ impl Ebook {
 
             // Collect /define links from the text and add to see_also list.
 
+            for link in re_define_parens_mid_end.captures_iter(&def) {
+                let word = format!("{}{}{}{}", link[2].to_string(), link[3].to_string(), link[4].to_string(), link[5].to_string());
+                w.word_header.see_also.push(word);
+            }
+
+            for link in re_define_parens_mid.captures_iter(&def) {
+                let word = format!("{}{}{}", link[2].to_string(), link[3].to_string(), link[4].to_string());
+                w.word_header.see_also.push(word);
+            }
+
+            for link in re_define_parens_end.captures_iter(&def) {
+                let word = format!("{}{}", link[2].to_string(), link[3].to_string());
+                w.word_header.see_also.push(word);
+            }
+
             for link in re_define.captures_iter(&def) {
                 w.word_header.see_also.push(link[2].to_string());
             }
 
             // [wordlabel](/define/wordlink) -> [[wordlink]]
+            def = re_define_parens_mid_end.replace_all(&def, "[[$2$3$4$5]]").to_string();
+            def = re_define_parens_mid.replace_all(&def, "[[$2$3$4]]").to_string();
+            def = re_define_parens_end.replace_all(&def, "[[$2$3]]").to_string();
             def = re_define.replace_all(&def, "[[$2]]").to_string();
             // Remove 'See also' from the text.
             def = re_see_also.replace_all(&def, "").to_string();
@@ -1307,7 +1375,7 @@ impl Ebook {
             )
                 .unwrap();
             let re_abbr_four = Regex::new(r"^\(*(caus|part|pass|pron)\.*\)*\.*\b").unwrap();
-            let re_abbr_more = Regex::new(r"^\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
+            let re_abbr_more = Regex::new(r"^\(*(absol|abstr|accus|compar|desid|feminine|impers|instr|masculine|metaph|neuter|plural|singular|trans)\.*\)*\.*\b").unwrap();
 
             // ~ā
             let re_suffix_a = Regex::new(r"^\\*~*[aā],* +").unwrap();
@@ -1478,6 +1546,49 @@ impl Ebook {
 
         Ok(())
     }
+
+    pub fn word_to_link(valid_words: &[String], output_format: OutputFormat, w: &str) -> String {
+        if valid_words.contains(&w.to_string()) {
+            match output_format {
+                OutputFormat::Epub | OutputFormat::Mobi => {
+                    // TODO contruct <a href=""> link
+                    w.to_string()
+                }
+
+                OutputFormat::BabylonGls | OutputFormat::StardictXml => {
+                    format!("<a href=\"bword://{}\">{}</a>", w, w)
+                }
+            }
+        } else {
+            //info!("not found: {}", w);
+            w.to_string()
+        }
+    }
+
+    /// Turn word lists into links for valid words.
+    ///
+    /// Run this before rendering, when no more words are added to `see_also` and other lists.
+    pub fn process_links(&mut self) {
+        info!("process_links()");
+
+        for (_key, dict_word) in self.dict_words.iter_mut() {
+            for w in dict_word.word_header.synonyms.iter_mut() {
+                *w = Ebook::word_to_link(&self.valid_words, self.output_format, w);
+            }
+
+            for w in dict_word.word_header.antonyms.iter_mut() {
+                *w = Ebook::word_to_link(&self.valid_words, self.output_format, w);
+            }
+
+            for w in dict_word.word_header.see_also.iter_mut() {
+                *w = Ebook::word_to_link(&self.valid_words, self.output_format, w);
+            }
+
+            for w in dict_word.word_header.also_written_as.iter_mut() {
+                *w = Ebook::word_to_link(&self.valid_words, self.output_format, w);
+            }
+        }
+    }
 }
 
 fn reg_tmpl(h: &mut Handlebars, k: &str, afs: &BTreeMap<String, String>) {
diff --git a/src/helpers.rs b/src/helpers.rs
index 461d82c..da6c808 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -51,7 +51,7 @@ pub fn word_list(
     let items_content = if let Some(items) = items.as_array() {
         if !items.is_empty() {
             items.iter()
-                .map(|i| format!("<a href=\"bword://{}\">{}</a>", i.render(), i.render()))
+                .map(|i| i.render())
                 .collect::<Vec<String>>()
                 .join(", ")
         } else {
diff --git a/src/main.rs b/src/main.rs
index 1248bed..4232523 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -93,11 +93,14 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
-            ebook.process_also_written_as();
-            ebook.process_strip_repeat_word_title();
-            ebook.process_grammar_note();
-            ebook.process_see_also_from_definition();
-            ok_or_exit(app_params.used_first_arg, ebook.process_summary());
+            if !app_params.dont_process {
+                ebook.process_tidy();
+                ebook.process_also_written_as();
+                ebook.process_strip_repeat_word_title();
+                ebook.process_grammar_note();
+                ebook.process_see_also_from_definition();
+                ok_or_exit(app_params.used_first_arg, ebook.process_summary());
+            }
 
             ok_or_exit(app_params.used_first_arg, ebook.write_markdown());
         }
@@ -151,10 +154,14 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_links();
+
+            // If title was given on CLI, override
             if let Some(ref title) = app_params.title {
                 ebook.meta.title = title.clone();
             }
 
+            // If dict_label was given on CLI, override
             if let Some(ref dict_label) = app_params.dict_label {
                 for (_key, word) in ebook.dict_words.iter_mut() {
                     word.word_header.dict_label = dict_label.clone();
@@ -197,6 +204,8 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_links();
+
             // Convert /define/word links with bword://word, as recognized by Stardict.
             for (_, w) in ebook.dict_words.iter_mut() {
                 let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
@@ -245,6 +254,8 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_links();
+
             if let Some(ref title) = app_params.title {
                 ebook.meta.title = title.clone();
             }
diff --git a/tests/data/grammar_note/grammar_note.md b/tests/data/processing/processing.md
similarity index 82%
rename from tests/data/grammar_note/grammar_note.md
rename to tests/data/processing/processing.md
index c9326b4..df01e91 100644
--- a/tests/data/grammar_note/grammar_note.md
+++ b/tests/data/processing/processing.md
@@ -659,3 +659,125 @@ also_written_as = []
 kurumāna
 
 part. pr. mfn. (see *[kurute](/define/kurute)*)
+
+``` toml
+dict_label = "NCPED"
+word = "cittappamāthi"
+summary = ""
+grammar = ""
+phonetic = ""
+transliteration = ""
+inflections = ["cittappamathi"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+citta(p)pamāthi(n)
+
+mfn. troubling, harassing the thoughts.
+
+``` toml
+word = "anupanāhi"
+```
+
+anupanāhi(n)
+
+mfn. (also *anūpanāhi(n)*) not resentful; without rancor (see *[upanāhi(n)](/define/upanāhi(n))*).
+
+``` toml
+word = "anādhānagāhin"
+```
+
+anādhānagāhinanādhāna(g)gāhi(n)
+
+neg. mfn. (see *[ādhāna(g)gāhi(n)](/define/ādhāna(g)gāhi(n))*)
+
+``` toml
+word = "abbhu"
+```
+
+abbhu(ṃ)
+
+ind. an exclamation of horror or fright or aversion (see also *[abhu(ṃ)](/define/abhu(ṃ))*)
+
+``` toml
+word = "kāḷānusāri"
+```
+
+kāḷānusāri
+
+masculine (or *kāḷānusāri(n)*?) a fragrant root; a powder made from this root (see *[kāla](/define/kāla)*)
+
+``` toml
+word = "uggharanta"
+```
+
+uggharanta
+
+mfn. (or ugghara(t)) dripping; oozing.
+
+``` toml
+word = "uddhaṅ-gāmi"
+```
+
+uddhaṅ\-gāmi(n)
+
+mfn. (also *uddhagāmi(n)*) going upwards; going upstream (see *[uddhaṃ](/define/uddhaṃ)*)
+
+``` toml
+word = "abalabala"
+```
+
+mfn. very foolish, very feeble; babbling (?) (see also *[abaḷabaḷa](/define/abaḷabaḷa)*)
+
+``` toml
+word = "abaḷabaḷa"
+```
+
+mfn. very foolish, very feeble; babbling (?) (see also *[abalabala](/define/abalabala)*)
+
+``` toml
+word = "abbahana"
+```
+
+neuter (from abbahati) pulling out, drawing out (see also *[abbuhana](/define/abbuhana)* and *[abbūhana](/define/abbūhana)*)
+
+``` toml
+word = "abbahati"
+```
+
+pr. 3 sg. tears up or off; pulls out, draws out (see also *[abbuhati](/define/abbuhati)* and *[abbūhati](/define/abbūhati)*)
+
+``` toml
+word = "abbahi"
+```
+
+aor. 3 sg. (see *[abbahati](/define/abbahati)*)
+
+``` toml
+word = "abbahitvā"
+```
+
+absol. (see *[abbahati](/define/abbahati)*)
+
+``` toml
+word = "abbha"
+```
+
+abbha
+
+masculine n. \~ā, feminine a cloud; a thundercloud.
+
+``` toml
+word = "abbhamatta"
+```
+
+neuter (or mfn.) (also *abbhāmatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
+
+``` toml
+word = "abbhamātta"
+```
+
+neuter (or mfn.) (also *abbhamatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
diff --git a/tests/data/grammar_note/grammar_note_expect.md b/tests/data/processing/processing_expect.md
similarity index 68%
rename from tests/data/grammar_note/grammar_note_expect.md
rename to tests/data/processing/processing_expect.md
index 7178dd3..0133799 100644
--- a/tests/data/grammar_note/grammar_note_expect.md
+++ b/tests/data/processing/processing_expect.md
@@ -1,3 +1,211 @@
+``` toml
+dict_label = ""
+word = "abalabala"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abaḷabaḷa"]
+also_written_as = []
+```
+
+very foolish, very feeble; babbling (?)
+
+``` toml
+dict_label = ""
+word = "abaḷabaḷa"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["abalabala"]
+synonyms = []
+antonyms = []
+see_also = ["abalabala"]
+also_written_as = []
+```
+
+very foolish, very feeble; babbling (?)
+
+``` toml
+dict_label = ""
+word = "abbahana"
+summary = ""
+grammar = "neuter"
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbuhana", "abbūhana"]
+also_written_as = []
+```
+
+(from abbahati) pulling out, drawing out
+
+``` toml
+dict_label = ""
+word = "abbahati"
+summary = ""
+grammar = "pr. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbuhati", "abbūhati"]
+also_written_as = []
+```
+
+tears up or off; pulls out, draws out
+
+``` toml
+dict_label = ""
+word = "abbahi"
+summary = ""
+grammar = "aor. 3 sg."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbahati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = ""
+word = "abbahitvā"
+summary = ""
+grammar = "absol."
+phonetic = ""
+transliteration = ""
+inflections = ["abbahitva"]
+synonyms = []
+antonyms = []
+see_also = ["abbahati"]
+also_written_as = []
+```
+
+
+
+``` toml
+dict_label = ""
+word = "abbha"
+summary = ""
+grammar = "masculine n. \\~ā, feminine a"
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+cloud; a thundercloud.
+
+``` toml
+dict_label = ""
+word = "abbhamatta"
+summary = ""
+grammar = "neuter"
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abbhāmatta", "abbha"]
+also_written_as = []
+```
+
+(or mfn.) (of) the size of a cloud
+
+``` toml
+dict_label = ""
+word = "abbhamātta"
+summary = ""
+grammar = "neuter"
+phonetic = ""
+transliteration = ""
+inflections = ["abbhamatta"]
+synonyms = []
+antonyms = []
+see_also = ["abbhamatta", "abbha"]
+also_written_as = []
+```
+
+(or mfn.) (of) the size of a cloud
+
+``` toml
+dict_label = ""
+word = "abbhu"
+summary = ""
+grammar = "ind."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = ["abhuṃ"]
+also_written_as = ["abbhuṃ"]
+```
+
+an exclamation of horror or fright or aversion
+
+``` toml
+dict_label = ""
+word = "anupanāhi"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["anupanahi"]
+synonyms = []
+antonyms = []
+see_also = ["upanāhin"]
+also_written_as = ["anupanāhin"]
+```
+
+(also *anūpanāhi(n)*) not resentful; without rancor.
+
+``` toml
+dict_label = ""
+word = "anādhānagāhin"
+summary = ""
+grammar = "neg. mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["anadhanagahin"]
+synonyms = []
+antonyms = []
+see_also = ["ādhānaggāhin"]
+also_written_as = ["anādhānagāhinanādhānaggāhin"]
+```
+
+
+
+``` toml
+dict_label = "NCPED"
+word = "cittappamāthi"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["cittappamathi"]
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = ["cittappamāthin"]
+```
+
+troubling, harassing the thoughts.
+
 ``` toml
 dict_label = "NCPED"
 word = "kupita"
@@ -128,6 +336,54 @@ also_written_as = []
 
 
 
+``` toml
+dict_label = ""
+word = "kāḷānusāri"
+summary = ""
+grammar = "masculine"
+phonetic = ""
+transliteration = ""
+inflections = ["kalanusari"]
+synonyms = []
+antonyms = []
+see_also = ["kāla"]
+also_written_as = []
+```
+
+(or *kāḷānusāri(n)*?) a fragrant root; a powder made from this root
+
+``` toml
+dict_label = ""
+word = "uddhaṅ-gāmi"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = ["uddhan-gami"]
+synonyms = []
+antonyms = []
+see_also = ["uddhaṃ"]
+also_written_as = ["uddhaṅ\\-gāmin"]
+```
+
+(also *uddhagāmi(n)*) going upwards; going upstream
+
+``` toml
+dict_label = ""
+word = "uggharanta"
+summary = ""
+grammar = "mfn."
+phonetic = ""
+transliteration = ""
+inflections = []
+synonyms = []
+antonyms = []
+see_also = []
+also_written_as = []
+```
+
+(or ugghara(t)) dripping; oozing.
+
 ``` toml
 dict_label = "NCPED"
 word = "āsaṅkamāna"
diff --git a/tests/data/see_also/see_also_parens.md b/tests/data/see_also/see_also_parens.md
deleted file mode 100644
index ed5beb6..0000000
--- a/tests/data/see_also/see_also_parens.md
+++ /dev/null
@@ -1,55 +0,0 @@
---- DICTIONARY METADATA ---
-
-``` toml
-title = "Dictionary"
-```
-
---- DICTIONARY WORD ENTRIES ---
-
-``` toml
-word = "anupanāhi"
-```
-
-anupanāhi(n)
-
-mfn. (also *anūpanāhi(n)*) not resentful; without rancor (see *[upanāhi(n)](/define/upanāhi(n))*).
-
-``` toml
-word = "anādhānagāhin"
-```
-
-anādhānagāhinanādhāna(g)gāhi(n)
-
-neg. mfn. (see *[ādhāna(g)gāhi(n)](/define/ādhāna(g)gāhi(n))*)
-
-``` toml
-word = "abbhu"
-```
-
-abbhu(ṃ)
-
-ind. an exclamation of horror or fright or aversion (see also *[abhu(ṃ)](/define/abhu(ṃ))*)
-
-``` toml
-word = "kāḷānusāri"
-```
-
-kāḷānusāri
-
-masculine (or *kāḷānusāri(n)*?) a fragrant root; a powder made from this root (see *[kāla](/define/kāla)*)
-
-``` toml
-word = "uggharanta"
-```
-
-uggharanta
-
-mfn. (or ugghara(t)) dripping; oozing.
-
-``` toml
-word = "uddhaṅ-gāmi"
-```
-
-uddhaṅ\-gāmi(n)
-
-mfn. (also *uddhagāmi(n)*) going upwards; going upstream (see *[uddhaṃ](/define/uddhaṃ)*)
diff --git a/tests/data/see_also/see_also_parens_expect.md b/tests/data/see_also/see_also_parens_expect.md
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/data/see_also/see_also_simple.md b/tests/data/see_also/see_also_simple.md
deleted file mode 100644
index 72842c1..0000000
--- a/tests/data/see_also/see_also_simple.md
+++ /dev/null
@@ -1,64 +0,0 @@
---- DICTIONARY METADATA ---
-
-``` toml
-title = "Dictionary"
-```
-
---- DICTIONARY WORD ENTRIES ---
-
-``` toml
-word = "abalabala"
-```
-
-mfn. very foolish, very feeble; babbling (?) (see also *[abaḷabaḷa](/define/abaḷabaḷa)*)
-
-``` toml
-word = "abaḷabaḷa"
-```
-
-mfn. very foolish, very feeble; babbling (?) (see also *[abalabala](/define/abalabala)*)
-
-``` toml
-word = "abbahana"
-```
-
-neuter (from abbahati) pulling out, drawing out (see also *[abbuhana](/define/abbuhana)* and *[abbūhana](/define/abbūhana)*)
-
-``` toml
-word = "abbahati"
-```
-
-pr. 3 sg. tears up or off; pulls out, draws out (see also *[abbuhati](/define/abbuhati)* and *[abbūhati](/define/abbūhati)*)
-
-``` toml
-word = "abbahi"
-```
-
-aor. 3 sg. (see *[abbahati](/define/abbahati)*)
-
-``` toml
-word = "abbahitvā"
-```
-
-absol. (see *[abbahati](/define/abbahati)*)
-
-``` toml
-word = "abbha"
-```
-
-abbha
-
-masculine n. \~ā, feminine a cloud; a thundercloud.
-
-``` toml
-word = "abbhamatta"
-```
-
-neuter (or mfn.) (also *abbhāmatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
-
-``` toml
-word = "abbhamātta"
-```
-
-neuter (or mfn.) (also *abbhamatta*) (of) the size of a cloud (see *[abbha](/define/abbha)*)
-
diff --git a/tests/data/see_also/see_also_simple_expect.md b/tests/data/see_also/see_also_simple_expect.md
deleted file mode 100644
index c44f522..0000000
--- a/tests/data/see_also/see_also_simple_expect.md
+++ /dev/null
@@ -1,136 +0,0 @@
-``` toml
-dict_label = ""
-word = "abalabala"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = ["abaḷabaḷa"]
-```
-
-mfn. very foolish, very feeble; babbling (?)
-
-``` toml
-dict_label = ""
-word = "abaḷabaḷa"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = ["abalabala"]
-synonyms = []
-antonyms = []
-see_also = ["abalabala"]
-```
-
-mfn. very foolish, very feeble; babbling (?)
-
-``` toml
-dict_label = ""
-word = "abbahana"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = ["abbuhana", "abbūhana"]
-```
-
-neuter (from abbahati) pulling out, drawing out
-
-``` toml
-dict_label = ""
-word = "abbahati"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = ["abbuhati", "abbūhati"]
-```
-
-pr. 3 sg. tears up or off; pulls out, draws out
-
-``` toml
-dict_label = ""
-word = "abbahi"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = ["abbahati"]
-```
-
-aor. 3 sg.
-
-``` toml
-dict_label = ""
-word = "abbahitvā"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = ["abbahitva"]
-synonyms = []
-antonyms = []
-see_also = ["abbahati"]
-```
-
-absol.
-
-``` toml
-dict_label = ""
-word = "abbha"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = []
-```
-
-abbha
-
-masculine n. \~ā, feminine a cloud; a thundercloud.
-
-``` toml
-dict_label = ""
-word = "abbhamatta"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = []
-synonyms = []
-antonyms = []
-see_also = ["abbhāmatta", "abbha"]
-```
-
-neuter (or mfn.) (of) the size of a cloud
-
-``` toml
-dict_label = ""
-word = "abbhamātta"
-summary = ""
-grammar = ""
-phonetic = ""
-transliteration = ""
-inflections = ["abbhamatta"]
-synonyms = []
-antonyms = []
-see_also = ["abbhamatta", "abbha"]
-```
-
-neuter (or mfn.) (of) the size of a cloud
\ No newline at end of file
diff --git a/tests/processing_from_definition.rs b/tests/processing_from_definition.rs
index 44cb482..3341c50 100644
--- a/tests/processing_from_definition.rs
+++ b/tests/processing_from_definition.rs
@@ -9,48 +9,10 @@ use simsapa_dictionary::app;
 use simsapa_dictionary::ebook::{Ebook, OutputFormat};
 
 #[test]
-fn see_also_from_definition_simple() {
+fn processing_from_definition() {
     let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
 
-    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/see_also/see_also_simple.md")];
-
-    app::process_markdown_list(sources, &mut ebook).unwrap();
-
-    ebook.process_see_also_from_definition();
-
-    let res = ebook.entries_as_markdown();
-    let expect = fs::read_to_string(&PathBuf::from("./tests/data/see_also/see_also_simple_expect.md")).unwrap();
-
-    assert_eq!(res, expect);
-}
-
-/*
-#[test]
-fn see_also_from_definition_parens() {
-    let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
-
-    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/see_also/see_also_parens.md")];
-
-    app::process_markdown_list(sources, &mut ebook).unwrap();
-
-    ebook.process_see_also_from_definition();
-
-    let res = ebook.entries_as_markdown();
-    //let mut file = File::create(&PathBuf::from("./tests/data/see_also/see_also_parens_expect.md")).unwrap();
-    //file.write_all(res.as_bytes()).unwrap();
-
-    let expect = fs::read_to_string(&PathBuf::from("./tests/data/see_also/see_also_parens_expect.md")).unwrap();
-    let expect = "".to_string();
-
-    assert_eq!(res, expect);
-}
-*/
-
-#[test]
-fn grammar_note() {
-    let mut ebook = Ebook::new(OutputFormat::Epub, &PathBuf::from("ebook.epub"));
-
-    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/grammar_note/grammar_note.md")];
+    let sources: Vec<PathBuf> = vec![PathBuf::from("./tests/data/processing/processing.md")];
 
     app::process_markdown_list(sources, &mut ebook).unwrap();
 
@@ -60,11 +22,11 @@ fn grammar_note() {
     ebook.process_see_also_from_definition();
 
     let res = ebook.entries_as_markdown();
-    //let mut file = File::create(&PathBuf::from("./tests/data/grammar_note/grammar_note_expect.md")).unwrap();
+    //let mut file = File::create(&PathBuf::from("./tests/data/processing/processing_expect.md")).unwrap();
     //file.write_all(res.as_bytes()).unwrap();
     //let expect = "".to_string();
 
-    let expect = fs::read_to_string(&PathBuf::from("./tests/data/grammar_note/grammar_note_expect.md")).unwrap();
+    let expect = fs::read_to_string(&PathBuf::from("./tests/data/processing/processing_expect.md")).unwrap();
 
     assert_eq!(res, expect);
 }

From 68ace600c3073c85e57f18638e49e5ebad03674a Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Fri, 15 Nov 2019 16:05:28 +0000
Subject: [PATCH 08/10] rename to add_velthuis

---
 assets/OEBPS/entries-epub.xhtml                  |  2 +-
 assets/OEBPS/entries-mobi.xhtml                  |  2 +-
 assets/stardict_textual.xml                      |  2 +-
 src/ebook.rs                                     |  8 ++++----
 src/helpers.rs                                   | 10 +++++-----
 tests/data/data with space/ncped custom cover.md |  2 +-
 tests/data/data with space/ncped with space.md   |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/assets/OEBPS/entries-epub.xhtml b/assets/OEBPS/entries-epub.xhtml
index 36c4a2b..d2f2cf2 100644
--- a/assets/OEBPS/entries-epub.xhtml
+++ b/assets/OEBPS/entries-epub.xhtml
@@ -6,7 +6,7 @@
 
 {{#each group.dict_words}}
 <h4>{{#if ../meta.word_prefix}}{{../meta.word_prefix}} {{/if}}{{word_header.word}}</h4>
-{{grammar_phonetic_transliteration word_header ../meta.use_velthuis ~}}
+{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 {{#if word_header.dict_label ~}}
 <p>[{{word_header.dict_label}}]</p>
 {{/if ~}}
diff --git a/assets/OEBPS/entries-mobi.xhtml b/assets/OEBPS/entries-mobi.xhtml
index 292cd0b..57b5382 100644
--- a/assets/OEBPS/entries-mobi.xhtml
+++ b/assets/OEBPS/entries-mobi.xhtml
@@ -7,7 +7,7 @@
 {{! Spaces and newlines in <idx:entry> are significant for dictionary entry search}}
 
 {{#each group.dict_words}}
-<idx:entry><idx:orth><h4>{{word_header.word}}</h4>{{grammar_phonetic_transliteration word_header ../meta.use_velthuis ~}}<p>{{#if word_header.dict_label}} <i>{{word_header.dict_label}}</i>{{/if}}{{#if word_header.summary}} <i>{{word_header.summary}}</i>{{/if}}{{#if word_header.inflections}}</p><idx:infl>{{#each word_header.inflections}} <idx:iform value="{{this}}"/>{{/each}}</idx:infl>{{/if}}</idx:orth></idx:entry>
+<idx:entry><idx:orth><h4>{{word_header.word}}</h4>{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}<p>{{#if word_header.dict_label}} <i>{{word_header.dict_label}}</i>{{/if}}{{#if word_header.summary}} <i>{{word_header.summary}}</i>{{/if}}{{#if word_header.inflections}}</p><idx:infl>{{#each word_header.inflections}} <idx:iform value="{{this}}"/>{{/each}}</idx:infl>{{/if}}</idx:orth></idx:entry>
 
 {{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md}}
diff --git a/assets/stardict_textual.xml b/assets/stardict_textual.xml
index dcb4881..0e4ec01 100644
--- a/assets/stardict_textual.xml
+++ b/assets/stardict_textual.xml
@@ -25,7 +25,7 @@
 
       <definition type="h">
         <![CDATA[
-{{grammar_phonetic_transliteration word_header ../meta.use_velthuis ~}}
+{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 {{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md ~}}
 {{word_list "Synonyms:" word_header.synonyms ~}}
diff --git a/src/ebook.rs b/src/ebook.rs
index a98a4c3..6222f14 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -80,7 +80,7 @@ pub struct EbookMetadata {
     #[serde(default)]
     pub word_prefix: String,
     #[serde(default)]
-    pub use_velthuis: bool,
+    pub add_velthuis: bool,
 }
 
 #[derive(Serialize, Deserialize, Copy, Clone)]
@@ -261,7 +261,7 @@ impl Ebook {
             new_word.word_header.inflections.push(new_word.word_header.transliteration.clone());
         }
 
-        if self.meta.use_velthuis {
+        if self.meta.add_velthuis {
             let s = pali::to_velthuis(&new_word.word_header.word);
             if !new_word.word_header.inflections.contains(&s) && s != new_word.word_header.word {
                 new_word.word_header.inflections.push(s);
@@ -989,7 +989,7 @@ impl Ebook {
                 &word.word_header.grammar,
                 &word.word_header.phonetic,
                 &word.word_header.transliteration,
-                self.meta.use_velthuis);
+                self.meta.add_velthuis);
 
             text.push_str(&s);
 
@@ -1615,7 +1615,7 @@ impl Default for EbookMetadata {
             created_date_human: "".to_string(),
             created_date_opf: "".to_string(),
             word_prefix: "".to_string(),
-            use_velthuis: false,
+            add_velthuis: false,
         }
     }
 }
diff --git a/src/helpers.rs b/src/helpers.rs
index da6c808..964a521 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -71,10 +71,10 @@ pub fn format_grammar_phonetic_transliteration(
     grammar: &str,
     phonetic: &str,
     transliteration: &str,
-    use_velthuis: bool)
+    add_velthuis: bool)
     -> String
 {
-    if grammar.is_empty() && phonetic.is_empty() && transliteration.is_empty() && !use_velthuis {
+    if grammar.is_empty() && phonetic.is_empty() && transliteration.is_empty() && !add_velthuis {
         return "".to_string();
     }
 
@@ -93,7 +93,7 @@ pub fn format_grammar_phonetic_transliteration(
     };
 
     let tr = if transliteration.is_empty() {
-        if use_velthuis {
+        if add_velthuis {
             // dark ocean blue
             format!(" | <span style=\"color: #0B4A72;\">{}</span>", pali::to_velthuis(&word))
         } else {
@@ -122,9 +122,9 @@ pub fn grammar_phonetic_transliteration(
     let phonetic = word_header.get("phonetic").unwrap().render();
     let transliteration = word_header.get("transliteration").unwrap().render();
 
-    let use_velthuis = h.param(1).unwrap().value().as_bool().unwrap();
+    let add_velthuis = h.param(1).unwrap().value().as_bool().unwrap();
 
-    out.write(&format_grammar_phonetic_transliteration(&word, &grammar, &phonetic, &transliteration, use_velthuis))?;
+    out.write(&format_grammar_phonetic_transliteration(&word, &grammar, &phonetic, &transliteration, add_velthuis))?;
     Ok(())
 }
 
diff --git a/tests/data/data with space/ncped custom cover.md b/tests/data/data with space/ncped custom cover.md
index 75e476e..3756d65 100644
--- a/tests/data/data with space/ncped custom cover.md	
+++ b/tests/data/data with space/ncped custom cover.md	
@@ -9,7 +9,7 @@ cover_path = "circle_cover.jpg"
 book_id = "NcpedDictionarySimsapa"
 created_date_human = ""
 created_date_opf = ""
-use_velthuis = false
+add_velthuis = false
 ```
 
 --- DICTIONARY WORD ENTRIES ---
diff --git a/tests/data/data with space/ncped with space.md b/tests/data/data with space/ncped with space.md
index 58e99f0..371b42e 100644
--- a/tests/data/data with space/ncped with space.md	
+++ b/tests/data/data with space/ncped with space.md	
@@ -9,7 +9,7 @@ cover_path = "default_cover.jpg"
 book_id = "NcpedDictionarySimsapa"
 created_date_human = ""
 created_date_opf = ""
-use_velthuis = false
+add_velthuis = false
 ```
 
 --- DICTIONARY WORD ENTRIES ---

From 9b24bdf6ab13c6d694bfffb2f3ce9ce87105775f Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Fri, 15 Nov 2019 16:11:22 +0000
Subject: [PATCH 09/10] upd

---
 src/ebook.rs | 50 +++++++++++++++++++++++++++-----------------------
 src/main.rs  |  3 +++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/ebook.rs b/src/ebook.rs
index 6222f14..d8e3170 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -234,6 +234,33 @@ impl Ebook {
         }
     }
 
+    /// Add transliterations to help searching:
+    /// - given with the transliteration attribute
+    /// - velthuis
+    /// - ascii
+    pub fn process_add_transliterations(&mut self) {
+        for (_, dict_word) in self.dict_words.iter_mut() {
+
+            if !dict_word.word_header.transliteration.is_empty() {
+                dict_word.word_header.inflections.push(dict_word.word_header.transliteration.clone());
+            }
+
+            if self.meta.add_velthuis {
+                let s = pali::to_velthuis(&dict_word.word_header.word);
+                if !dict_word.word_header.inflections.contains(&s) && s != dict_word.word_header.word {
+                    dict_word.word_header.inflections.push(s);
+                }
+            }
+
+            {
+                let s = deunicode(&dict_word.word_header.word);
+                if !dict_word.word_header.inflections.contains(&s) && s != dict_word.word_header.word {
+                    dict_word.word_header.inflections.push(s);
+                }
+            }
+        }
+    }
+
     pub fn add_word(&mut self, new_word: DictWord) {
         let mut new_word = new_word;
 
@@ -252,29 +279,6 @@ impl Ebook {
             new_word.word_header.word, grammar, label
         );
 
-        // Add transliterations to help searching:
-        // - given with the transliteration attribute
-        // - velthuis
-        // - ascii
-
-        if !new_word.word_header.transliteration.is_empty() {
-            new_word.word_header.inflections.push(new_word.word_header.transliteration.clone());
-        }
-
-        if self.meta.add_velthuis {
-            let s = pali::to_velthuis(&new_word.word_header.word);
-            if !new_word.word_header.inflections.contains(&s) && s != new_word.word_header.word {
-                new_word.word_header.inflections.push(s);
-            }
-        }
-
-        {
-            let s = deunicode(&new_word.word_header.word);
-            if !new_word.word_header.inflections.contains(&s) && s != new_word.word_header.word {
-                new_word.word_header.inflections.push(s);
-            }
-        }
-
         if !self.valid_words.contains(&new_word.word_header.word) {
             self.valid_words.push(new_word.word_header.word.clone());
         }
diff --git a/src/main.rs b/src/main.rs
index 4232523..72dbd09 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -154,6 +154,7 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_add_transliterations();
             ebook.process_links();
 
             // If title was given on CLI, override
@@ -204,6 +205,7 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_add_transliterations();
             ebook.process_links();
 
             // Convert /define/word links with bword://word, as recognized by Stardict.
@@ -254,6 +256,7 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            ebook.process_add_transliterations();
             ebook.process_links();
 
             if let Some(ref title) = app_params.title {

From 5db6acf00cf52c273eb2c00e300c45eb5f9eec4b Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date: Sun, 17 Nov 2019 12:16:17 +0000
Subject: [PATCH 10/10] upd

---
 Cargo.lock                                    |   2 +-
 Cargo.toml                                    |   2 +-
 appveyor.yml                                  |   2 +-
 assets/OEBPS/entries-epub.xhtml               |   5 +-
 assets/OEBPS/entries-mobi.xhtml               |   4 +-
 assets/stardict_textual.xml                   |   3 +
 scripts/build_dicts_for_release.sh            |  58 +++++++++++++++--
 scripts/json_to_md.sh                         |  60 +++++++++++++++---
 scripts/ncped_json_to_md.sh                   |  12 ++++
 scripts/nyana_to_md.sh                        |   5 +-
 src/app.rs                                    |  32 ++++++++--
 src/cli.yml                                   |  22 ++++++-
 src/ebook.rs                                  |  50 +++++++++++++--
 src/helpers.rs                                |   9 +++
 src/main.rs                                   |  29 ++++++++-
 .../data with space/ncped with space.xlsx     | Bin 7026 -> 6984 bytes
 16 files changed, 259 insertions(+), 36 deletions(-)
 create mode 100755 scripts/ncped_json_to_md.sh

diff --git a/Cargo.lock b/Cargo.lock
index d6ccc2e..1e48988 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -764,7 +764,7 @@ dependencies = [
 
 [[package]]
 name = "simsapa_dictionary"
-version = "0.1.0"
+version = "0.2.0-alpha.1"
 dependencies = [
  "calamine 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index fd78f3f..087f0d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simsapa_dictionary"
-version = "0.1.0"
+version = "0.2.0-alpha.1"
 authors = ["Gambhiro <gambhiro.bhikkhu.85@gmail.com>"]
 edition = "2018"
 license = "MIT"
diff --git a/appveyor.yml b/appveyor.yml
index 59c74da..eebe94d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: "0.1.0.{branch}.{build}"
+version: "0.2.0-alpha.1.{branch}.{build}"
 
 image: Visual Studio 2019
 
diff --git a/assets/OEBPS/entries-epub.xhtml b/assets/OEBPS/entries-epub.xhtml
index d2f2cf2..1432307 100644
--- a/assets/OEBPS/entries-epub.xhtml
+++ b/assets/OEBPS/entries-epub.xhtml
@@ -6,13 +6,10 @@
 
 {{#each group.dict_words}}
 <h4>{{#if ../meta.word_prefix}}{{../meta.word_prefix}} {{/if}}{{word_header.word}}</h4>
-{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 {{#if word_header.dict_label ~}}
 <p>[{{word_header.dict_label}}]</p>
 {{/if ~}}
-{{#if word_header.summary ~}}
-<p>{{word_header.summary}}</p>
-{{/if ~}}
+{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 
 {{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md}}
diff --git a/assets/OEBPS/entries-mobi.xhtml b/assets/OEBPS/entries-mobi.xhtml
index 57b5382..7930e43 100644
--- a/assets/OEBPS/entries-mobi.xhtml
+++ b/assets/OEBPS/entries-mobi.xhtml
@@ -7,7 +7,9 @@
 {{! Spaces and newlines in <idx:entry> are significant for dictionary entry search}}
 
 {{#each group.dict_words}}
-<idx:entry><idx:orth><h4>{{word_header.word}}</h4>{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}<p>{{#if word_header.dict_label}} <i>{{word_header.dict_label}}</i>{{/if}}{{#if word_header.summary}} <i>{{word_header.summary}}</i>{{/if}}{{#if word_header.inflections}}</p><idx:infl>{{#each word_header.inflections}} <idx:iform value="{{this}}"/>{{/each}}</idx:infl>{{/if}}</idx:orth></idx:entry>
+<idx:entry><idx:orth><h4>{{word_header.word}}</h4><p>{{#if word_header.dict_label}} <i>{{word_header.dict_label}}</i>{{/if}}{{#if word_header.summary}} <i>{{word_header.summary}}</i>{{/if}}{{#if word_header.inflections}}</p><idx:infl>{{#each word_header.inflections}} <idx:iform value="{{this}}"/>{{/each}}</idx:infl>{{/if}}</idx:orth></idx:entry>
+
+{{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 
 {{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md}}
diff --git a/assets/stardict_textual.xml b/assets/stardict_textual.xml
index 0e4ec01..986ec02 100644
--- a/assets/stardict_textual.xml
+++ b/assets/stardict_textual.xml
@@ -25,6 +25,9 @@
 
       <definition type="h">
         <![CDATA[
+{{#if word_header.dict_label ~}}
+<p>[{{word_header.dict_label}}]</p>
+{{/if ~}}
 {{grammar_phonetic_transliteration word_header ../meta.add_velthuis ~}}
 {{word_list "Also written as:" word_header.also_written_as ~}}
 {{markdown definition_md ~}}
diff --git a/scripts/build_dicts_for_release.sh b/scripts/build_dicts_for_release.sh
index 951dbb5..20e6af4 100755
--- a/scripts/build_dicts_for_release.sh
+++ b/scripts/build_dicts_for_release.sh
@@ -3,11 +3,22 @@
 SRC_DIR=../simsapa-dictionary-data
 OUT_DIR=../simsapa-dictionary_releases/new-release
 
+if [ -z "$OUT_DIR" ]; then
+    rm -r "$OUT_DIR"
+fi
+
+mkdir -p "$OUT_DIR"
+
+PROJ_ROOT=$(pwd)
+
 KINDLEGEN_PATH="$HOME/lib/kindlegen/kindlegen"
 
-# === Combined ===
+STARDICT_TEXT2BIN="/usr/lib/stardict-tools/stardict-text2bin"
+
+# === Individual ===
 
 for i in dhammika dppn ncped nyana pts; do
+    cd "$PROJ_ROOT"
 
     cargo run -- markdown_to_ebook \
         --source_path "$SRC_DIR/$i.md" \
@@ -23,21 +34,58 @@ for i in dhammika dppn ncped nyana pts; do
         --output_format epub \
         --output_path "$OUT_DIR/$i.epub"
 
+    # TODO epubcheck
+
+    stardict_out="$OUT_DIR/$i-stardict"
+    mkdir -p "$stardict_out"
+
+    cargo run -- markdown_to_stardict_xml \
+        --source_path "$SRC_DIR/$i.md" \
+        --output_path "$stardict_out/$i.xml"
+
+    cd "$stardict_out"
+    $STARDICT_TEXT2BIN "$i.xml" "$i.ifo"
+    rm "$i.xml"
+    cd ..
+    zip -r "$i-stardict.zip" "$i-stardict"
+    rm "$i-stardict" -r
+
 done
 
 # === Combined ===
 
+cd "$PROJ_ROOT"
+
+name="combined-dictionary"
+
 cargo run -- markdown_to_ebook \
-    --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --title "Combined Pali - English Dictionary" \
+    --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --output_format mobi \
-    --output_path "$OUT_DIR/combined-dictionary.mobi" \
+    --output_path "$OUT_DIR/$name.mobi" \
     --mobi_compression 0 \
     --kindlegen_path "$KINDLEGEN_PATH"
 
 cargo run -- markdown_to_ebook \
-    --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --title "Combined Pali - English Dictionary" \
+    --source_paths_list ./scripts/combined_dict_md_paths.txt \
     --output_format epub \
-    --output_path "$OUT_DIR/combined-dictionary.epub"
+    --output_path "$OUT_DIR/$name.epub"
+
+# TODO epubcheck
+
+stardict_out="$OUT_DIR/$name-stardict"
+mkdir -p "$stardict_out"
+
+cargo run -- markdown_to_stardict_xml \
+    --title "Combined Pali - English Dictionary" \
+    --source_paths_list ./scripts/combined_dict_md_paths.txt \
+    --output_path "$stardict_out/$name.xml"
+
+cd "$stardict_out"
+$STARDICT_TEXT2BIN "$name.xml" "$name.ifo"
+rm "$name.xml"
+cd ..
+zip -r "$name-stardict.zip" "$name-stardict"
+rm "$name-stardict" -r
 
diff --git a/scripts/json_to_md.sh b/scripts/json_to_md.sh
index e9afe4a..f0eb0c4 100755
--- a/scripts/json_to_md.sh
+++ b/scripts/json_to_md.sh
@@ -2,25 +2,67 @@
 
 #RUST_LOG=sources_to_markdown=info cargo run --bin sources_to_markdown 2>&1 | tee sources_to_markdown.log
 
-SC_ROOT="$HOME/src/suttacentral-2018-09-03/sc-data/dictionaries/en"
+SC_ROOT="$HOME/src/suttacentral-2019-11-15/sc-data/dictionaries/en"
 OUT_DIR="../simsapa-dictionary-data"
 
+# === Dhammika ===
+
+cargo run -- suttacentral_json_to_markdown \
+	--title "Dhammika Pali - English Dictionary" \
+	--dict_label Dhammika \
+	--json_path "$SC_ROOT/dhammika.json" \
+	--output_path "$OUT_DIR/dhammika.md"
+
 cargo run -- suttacentral_json_to_markdown \
+	--title "Dhammika Pali - English Dictionary" \
+	--dict_label Dhammika \
+	--dont_process \
 	--json_path "$SC_ROOT/dhammika.json" \
-	--output_path "$OUT_DIR/dhammika.md" \
-	--dict_label Dhammika
+	--output_path "$OUT_DIR/dhammika_unprocessed.md"
+
+# === DPPN ===
+
+cargo run -- suttacentral_json_to_markdown \
+	--title "Dictionary of Pali Proper Names (DPPN)" \
+	--dict_label DPPN \
+	--json_path "$SC_ROOT/dppn.json" \
+	--output_path "$OUT_DIR/dppn.md"
 
 cargo run -- suttacentral_json_to_markdown \
+	--title "Dictionary of Pali Proper Names (DPPN)" \
+	--dict_label DPPN \
+	--dont_process \
 	--json_path "$SC_ROOT/dppn.json" \
-	--output_path "$OUT_DIR/dppn.md" \
-	--dict_label DPPN
+	--output_path "$OUT_DIR/dppn_unprocessed.md"
+
+# === NCPED ===
+
+cargo run -- suttacentral_json_to_markdown \
+	--title "New Concise Pali - English Dictionary (NCPED)" \
+	--dict_label NCPED \
+	--json_path "$SC_ROOT/ncped.json" \
+	--output_path "$OUT_DIR/ncped.md"
 
 cargo run -- suttacentral_json_to_markdown \
+	--title "New Concise Pali - English Dictionary (NCPED)" \
+	--dict_label NCPED \
+	--dont_process \
 	--json_path "$SC_ROOT/ncped.json" \
-	--output_path "$OUT_DIR/ncped.md" \
-	--dict_label NCPED
+	--output_path "$OUT_DIR/ncped_unprocessed.md"
+
+# === PTS ===
+
+cargo run -- suttacentral_json_to_markdown \
+	--title "Pali Text Society Pali - English Dictionary (PTS)" \
+	--dict_label PTS \
+	--dont_remove_see_also \
+	--json_path "$SC_ROOT/pts.json" \
+	--output_path "$OUT_DIR/pts.md"
 
 cargo run -- suttacentral_json_to_markdown \
+	--title "Pali Text Society Pali - English Dictionary (PTS)" \
+	--dict_label PTS \
+	--dont_process \
+	--dont_remove_see_also \
 	--json_path "$SC_ROOT/pts.json" \
-	--output_path "$OUT_DIR/pts.md" \
-	--dict_label PTS
+	--output_path "$OUT_DIR/pts_unprocessed.md"
diff --git a/scripts/ncped_json_to_md.sh b/scripts/ncped_json_to_md.sh
new file mode 100755
index 0000000..8e02434
--- /dev/null
+++ b/scripts/ncped_json_to_md.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#RUST_LOG=sources_to_markdown=info cargo run --bin sources_to_markdown 2>&1 | tee sources_to_markdown.log
+
+SC_ROOT="$HOME/src/suttacentral-2019-11-15/sc-data/dictionaries/en"
+OUT_DIR="../simsapa-dictionary-data"
+
+cargo run -- suttacentral_json_to_markdown \
+	--json_path "$SC_ROOT/ncped.json" \
+	--output_path "$OUT_DIR/ncped.md" \
+	--dict_label NCPED
+
diff --git a/scripts/nyana_to_md.sh b/scripts/nyana_to_md.sh
index 153365e..c7cec95 100755
--- a/scripts/nyana_to_md.sh
+++ b/scripts/nyana_to_md.sh
@@ -4,7 +4,8 @@ NYANA_ROOT="$HOME/src/dict-nyanatiloka"
 OUT_DIR="../simsapa-dictionary-data"
 
 cargo run -- nyanatiloka_to_markdown \
+	--title "Nyanatiloka Buddhist Dictionary" \
+	--dict_label Nyana \
 	--nyanatiloka_root "$NYANA_ROOT" \
-	--output_path "$OUT_DIR/nyana.md" \
-	--dict_label Nyana
+	--output_path "$OUT_DIR/nyana.md"
 
diff --git a/src/app.rs b/src/app.rs
index 6811125..c56891d 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -29,6 +29,7 @@ pub struct AppStartParams {
     pub dont_run_kindlegen: bool,
     pub dont_remove_generated_files: bool,
     pub dont_process: bool,
+    pub dont_remove_see_also: bool,
     pub run_command: RunCommand,
     pub show_logs: bool,
     pub zip_with: ZipWith,
@@ -82,6 +83,7 @@ impl Default for AppStartParams {
             dont_run_kindlegen: false,
             dont_remove_generated_files: false,
             dont_process: false,
+            dont_remove_see_also: false,
             run_command: RunCommand::NoOp,
             show_logs: false,
             zip_with,
@@ -589,6 +591,14 @@ pub fn process_cli_args(matches: clap::ArgMatches) -> Result<AppStartParams, Box
             params.output_path = Some(PathBuf::from(&x));
         }
 
+        if let Ok(x) = sub_matches
+            .value_of("title")
+            .unwrap()
+            .parse::<String>()
+        {
+            params.title = Some(x);
+        }
+
         if let Ok(x) = sub_matches
             .value_of("dict_label")
             .unwrap()
@@ -601,6 +611,10 @@ pub fn process_cli_args(matches: clap::ArgMatches) -> Result<AppStartParams, Box
             params.dont_process = true;
         }
 
+        if sub_matches.is_present("dont_remove_see_also") {
+            params.dont_process = true;
+        }
+
         params.run_command = RunCommand::SuttaCentralJsonToMarkdown;
 
     } else if let Some(sub_matches) = matches.subcommand_matches("nyanatiloka_to_markdown") {
@@ -626,6 +640,14 @@ pub fn process_cli_args(matches: clap::ArgMatches) -> Result<AppStartParams, Box
             params.output_path = Some(PathBuf::from(&x));
         }
 
+        if let Ok(x) = sub_matches
+            .value_of("title")
+            .unwrap()
+            .parse::<String>()
+        {
+            params.title = Some(x);
+        }
+
         if let Ok(x) = sub_matches
             .value_of("dict_label")
             .unwrap()
@@ -690,7 +712,7 @@ pub fn process_suttacentral_json(
     for e in entries.iter() {
         let new_word = DictWord {
             word_header: DictWordHeader {
-                dict_label: dict_label.to_string(),
+                dict_label: (*dict_label).to_string(),
                 word: e.word.to_lowercase(),
                 summary: "".to_string(),
                 grammar: "".to_string(),
@@ -763,7 +785,7 @@ pub fn process_nyanatiloka_entries(
     for e in entries.iter() {
         let new_word = DictWord {
             word_header: DictWordHeader {
-                dict_label: dict_label.to_string(),
+                dict_label: (*dict_label).to_string(),
                 word: e.word.to_lowercase(),
                 summary: "".to_string(),
                 grammar: "".to_string(),
@@ -824,9 +846,9 @@ pub fn process_markdown(source_path: &PathBuf, ebook: &mut Ebook) -> Result<(),
         return Err(Box::new(ToolError::Exit(msg)));
     }
 
-    let a = parts
+    let a = (*parts
         .get(0)
-        .unwrap()
+        .unwrap())
         .to_string()
         .replace(DICTIONARY_METADATA_SEP, "")
         .replace("``` toml", "")
@@ -834,7 +856,7 @@ pub fn process_markdown(source_path: &PathBuf, ebook: &mut Ebook) -> Result<(),
 
     ebook.meta = parse_str_to_metadata(&a)?;
 
-    let a = parts.get(1).unwrap().to_string();
+    let a = (*parts.get(1).unwrap()).to_string();
     let entries: Vec<Result<DictWord, Box<dyn Error>>> = a
         .split("``` toml")
         .filter_map(|s| {
diff --git a/src/cli.yml b/src/cli.yml
index e03ca23..b299af8 100644
--- a/src/cli.yml
+++ b/src/cli.yml
@@ -1,5 +1,5 @@
 name: "Simsapa Dictionary Tool"
-version: "0.1.0"
+version: "0.2.0-alpha.1"
 author: "https://simsapa.github.io/"
 about: "Generating dictionaries in various formats"
 
@@ -362,6 +362,13 @@ subcommands:
             required: true
             takes_value: true
 
+        - title:
+            help: "Use this title for the dictionary."
+            long: title
+            value_name: TITLE
+            required: false
+            takes_value: true
+
         - dict_label:
             help: "The short id label (such as NCPED or PED) to use for this dictionary source."
             long: dict_label
@@ -375,6 +382,12 @@ subcommands:
             required: false
             takes_value: false
 
+        - dont_remove_see_also:
+            help: "Don't remove the '(See also...)' type text when processing."
+            long: dont_remove_see_also
+            required: false
+            takes_value: false
+
   - nyanatiloka_to_markdown:
       about: "Process Ven. Nyanatiloka's Buddhist Dictionary and write a Markdown file with TOML headers."
 
@@ -393,6 +406,13 @@ subcommands:
             required: true
             takes_value: true
 
+        - title:
+            help: "Use this title for the dictionary."
+            long: title
+            value_name: TITLE
+            required: false
+            takes_value: true
+
         - dict_label:
             help: "The short id label (such as 'Nyana') to use for this dictionary source."
             long: dict_label
diff --git a/src/ebook.rs b/src/ebook.rs
index d8e3170..8411a2f 100644
--- a/src/ebook.rs
+++ b/src/ebook.rs
@@ -14,7 +14,7 @@ use deunicode::deunicode;
 use crate::app::{AppStartParams, ZipWith};
 use crate::dict_word::DictWord;
 use crate::error::ToolError;
-use crate::helpers::{self, is_hidden, md2html};
+use crate::helpers::{self, is_hidden, md2html, uppercase_first_letter};
 use crate::letter_groups::{LetterGroups, LetterGroup};
 use crate::pali;
 
@@ -691,7 +691,7 @@ impl Ebook {
         for filename in ["container.xml", "com.apple.ibooks.display-options.xml"].iter() {
             let file_content = self
                 .asset_files_byte
-                .get(&filename.to_string())
+                .get(&(*filename).to_string())
                 .ok_or("missing get key")?;
             let mut file = File::create(dir.join(filename))?;
             file.write_all(file_content)?;
@@ -987,6 +987,10 @@ impl Ebook {
 
             let mut text = String::new();
 
+            if !word.word_header.dict_label.is_empty() {
+                text.push_str(&format!("<p>[{}]</p>", &word.word_header.dict_label));
+            }
+
             // grammar, phonetic, transliteration
             let s = helpers::format_grammar_phonetic_transliteration(
                 &word.word_header.word,
@@ -1178,7 +1182,10 @@ impl Ebook {
             // The simplest case, the whole word
             // - abhijanat, abhikamin
             // Don't match parens variations abhikami(n), which would leave only (n)
+            // abhijanat
             s = s.trim_start_matches(&format!("{}\n", word)).trim().to_string();
+            // Abhijanat
+            s = s.trim_start_matches(&format!("{}\n", uppercase_first_letter(&word))).trim().to_string();
 
             dict_word.definition_md = s;
         }
@@ -1271,7 +1278,7 @@ impl Ebook {
         }
     }
 
-    pub fn process_see_also_from_definition(&mut self) {
+    pub fn process_see_also_from_definition(&mut self, dont_remove_see_also: bool) {
         info!("process_see_also_from_definition()");
 
         // [ab(b)ha(t)](/define/ab(b)ha(t))
@@ -1345,7 +1352,9 @@ impl Ebook {
             def = re_define_parens_end.replace_all(&def, "[[$2$3]]").to_string();
             def = re_define.replace_all(&def, "[[$2]]").to_string();
             // Remove 'See also' from the text.
-            def = re_see_also.replace_all(&def, "").to_string();
+            if !dont_remove_see_also {
+                def = re_see_also.replace_all(&def, "").to_string();
+            }
             // [[wordlink]] -> [wordlink](/define/wordlink)
             def = re_bracket_links.replace_all(&def, "[$1](/define/$1)").to_string();
 
@@ -1353,6 +1362,37 @@ impl Ebook {
         }
     }
 
+    pub fn process_define_links(&mut self) {
+        // [abhuṃ](/define/abhuṃ)
+        let re_define = Regex::new(r"\[([^\]]+)\]\(/define/([^\(\)]+)\)").unwrap();
+
+        for (_, dict_word) in self.dict_words.iter_mut() {
+            let def = dict_word.definition_md.clone();
+            for cap in re_define.captures_iter(&def) {
+                let link = cap[0].to_string();
+                let word = cap[2].to_string();
+
+                if self.valid_words.contains(&word) {
+                    // If it is a valid word entry, replace to bword:// for Stardict and Babylon.
+                    match self.output_format {
+                        OutputFormat::StardictXml | OutputFormat::BabylonGls => {
+                            let mut s = dict_word.definition_md.clone();
+                            s = s.replace(&link, &format!("[{}](bword://{})", word, word)).to_string();
+                            dict_word.definition_md = s;
+                        }
+                        _ => {}
+                    }
+                } else {
+                    // If it is not a valid word entry, we will replace it with text.
+                    let mut s = dict_word.definition_md.clone();
+                    s = s.replace(&link, &format!("*{}*", word)).to_string();
+                    dict_word.definition_md = s;
+                }
+
+            }
+        }
+    }
+
     pub fn process_summary(&mut self) -> Result<(), Box<dyn Error>> {
             let re_links = Regex::new(r"\[([^\]]*)\]\([^\)]*\)").unwrap();
             let re_spaces = Regex::new("  +").unwrap();
@@ -1615,7 +1655,7 @@ impl Default for EbookMetadata {
             source: "https://simsapa.github.io".to_string(),
             cover_path: "default_cover.jpg".to_string(),
             book_id: "SimsapaPaliDictionary".to_string(),
-            version: "0.1.0".to_string(),
+            version: "0.2.0-alpha.1".to_string(),
             created_date_human: "".to_string(),
             created_date_opf: "".to_string(),
             word_prefix: "".to_string(),
diff --git a/src/helpers.rs b/src/helpers.rs
index 964a521..f81c3de 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -168,3 +168,12 @@ pub fn ok_or_exit<T>(wait: bool, res: Result<T, Box<dyn Error>>) -> T {
         }
     }
 }
+
+/// https://stackoverflow.com/questions/38406793/why-is-capitalizing-the-first-letter-of-a-string-so-convoluted-in-rust
+pub fn uppercase_first_letter(s: &str) -> String {
+    let mut c = s.chars();
+    match c.next() {
+        None => String::new(),
+        Some(f) => f.to_uppercase().collect::<String>() + c.as_str(),
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 72dbd09..f74bb49 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -98,10 +98,22 @@ fn main() {
                 ebook.process_also_written_as();
                 ebook.process_strip_repeat_word_title();
                 ebook.process_grammar_note();
-                ebook.process_see_also_from_definition();
+                ebook.process_see_also_from_definition(app_params.dont_remove_see_also);
                 ok_or_exit(app_params.used_first_arg, ebook.process_summary());
             }
 
+            // If title was given on CLI, override
+            if let Some(ref title) = app_params.title {
+                ebook.meta.title = title.clone();
+            }
+
+            // If dict_label was given on CLI, override
+            if let Some(ref dict_label) = app_params.dict_label {
+                for (_key, word) in ebook.dict_words.iter_mut() {
+                    word.word_header.dict_label = dict_label.clone();
+                }
+            }
+
             ok_or_exit(app_params.used_first_arg, ebook.write_markdown());
         }
 
@@ -122,6 +134,18 @@ fn main() {
 
             info!("Added words: {}", ebook.len());
 
+            // If title was given on CLI, override
+            if let Some(ref title) = app_params.title {
+                ebook.meta.title = title.clone();
+            }
+
+            // If dict_label was given on CLI, override
+            if let Some(ref dict_label) = app_params.dict_label {
+                for (_key, word) in ebook.dict_words.iter_mut() {
+                    word.word_header.dict_label = dict_label.clone();
+                }
+            }
+
             ok_or_exit(app_params.used_first_arg, ebook.write_markdown());
         }
 
@@ -156,6 +180,7 @@ fn main() {
 
             ebook.process_add_transliterations();
             ebook.process_links();
+            ebook.process_define_links();
 
             // If title was given on CLI, override
             if let Some(ref title) = app_params.title {
@@ -207,6 +232,7 @@ fn main() {
 
             ebook.process_add_transliterations();
             ebook.process_links();
+            ebook.process_define_links();
 
             // Convert /define/word links with bword://word, as recognized by Stardict.
             for (_, w) in ebook.dict_words.iter_mut() {
@@ -258,6 +284,7 @@ fn main() {
 
             ebook.process_add_transliterations();
             ebook.process_links();
+            ebook.process_define_links();
 
             if let Some(ref title) = app_params.title {
                 ebook.meta.title = title.clone();
diff --git a/tests/data/data with space/ncped with space.xlsx b/tests/data/data with space/ncped with space.xlsx
index e71f579dd67dc3c6d0b3bbd59a8d8391fa49929d..9d56f2d7f6e79415295f1f47b00a13b7f37e760e 100644
GIT binary patch
delta 2665
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

delta 2720
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
b{U&*s*CMbV5fwooOs6rT5Lvd_pE3Uz9n8Y_