decasify 0.8.0__tar.gz → 0.9.0__tar.gz

{decasify-0.8.0 → decasify-0.9.0}/Cargo.lock

@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "decasify"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1691,6 +1691,15 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "typst"
+version = "0.9.0"
+dependencies = [
+ "anyhow",
+ "decasify",
+ "wasm-minimal-protocol",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.17"
@@ -1747,6 +1756,16 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "venial"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "vergen"
 version = "9.0.1"
@@ -1869,6 +1888,17 @@ version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
+[[package]]
+name = "wasm-minimal-protocol"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "264a7e0acbdd292aca03fee87eaea5a07647394c8985b19be27e950bde57930a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "venial",
+]
+
 [[package]]
 name = "winapi-util"
 version = "0.1.9"

{decasify-0.8.0 → decasify-0.9.0}/Cargo.toml

@@ -1,28 +1,49 @@
 [package]
 name = "decasify"
-version = "0.8.0"
-authors = ["Caleb Maclennan <caleb@alerque.com>"]
-edition = "2021"
-rust-version = "1.73.0"
+version = "0.9.0"
 description = "A CLI utility and library to cast strings to title-case according to locale specific style guides including Turkish support"
 readme = "README.md"
+build = "build-aux/build.rs"
+include = ["*.rs"]
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[workspace.package]
+version = "0.9.0"
+authors = ["Caleb Maclennan <caleb@alerque.com>"]
 homepage = "https://github.com/alerque/decasify"
 repository = "https://github.com/alerque/decasify"
 license = "LGPL-3.0-only"
-build = "build-aux/build.rs"
-include = ["*.rs"]
+edition = "2021"
+rust-version = "1.73.0"
 
-[lib]
-name = "decasify"
-crate-type = ["rlib", "cdylib"]
+[workspace]
+resolver = "2"
 
 [[bin]]
 name = "decasify"
 required-features = ["cli"]
 
+[lib]
+name = "decasify"
+crate-type = ["rlib", "cdylib"]
+
+[profile.release]
+lto = true
+
+[profile.typst]
+inherits = "release"
+opt-level = "z"
+strip = true
+
 [features]
 default = []
 full = ["cli", "bash", "elvish", "fish", "manpage", "powershell", "zsh"]
+modules = ["luamodule", "pythonmodule", "wasm"]
 completions = ["cli", "dep:clap_complete"]
 cli = ["dep:clap"]
 bash = ["completions"]
@@ -31,7 +52,7 @@ fish = ["completions"]
 manpage = ["dep:clap_mangen"]
 powershell = ["completions"]
 zsh = ["completions"]
-luamodule = []
+luamodule = ["mlua"]
 lua54 = ["luamodule", "mlua/lua54"]
 lua53 = ["luamodule", "mlua/lua53"]
 lua52 = ["luamodule", "mlua/lua52"]
@@ -41,8 +62,9 @@ pythonmodule = ["dep:pyo3"]
 unstable-trait = []
 wasm = ["dep:wasm-bindgen"]
 
-[profile.release]
-lto = true
+[workspace.dependencies.decasify]
+path = "."
+version = "0.9.0"
 
 [dependencies]
 regex = "1.11"
@@ -51,54 +73,54 @@ strum = "0.26"
 strum_macros = "0.26"
 unicode_titlecase = "2.4"
 
-  [dependencies.clap]
-  version = "4.5"
-  optional = true
-  features = ["derive", "wrap_help"]
+[dependencies.clap]
+version = "4.5"
+optional = true
+features = ["derive", "wrap_help"]
 
-  [dependencies.mlua]
-  version = "0.10.0"
-  optional = true
-  features = ["module"]
+[dependencies.mlua]
+version = "0.10.0"
+optional = true
+features = ["module"]
 
-  [dependencies.pyo3]
-  version = "0.22"
-  optional = true
-  features = [ "extension-module" ]
+[dependencies.pyo3]
+version = "0.22"
+optional = true
+features = ["extension-module"]
 
-  [dependencies.titlecase]
-  version = "3.3"
-  features = [ "perf" ]
+[dependencies.titlecase]
+version = "3.3"
+features = ["perf"]
 
-  [dependencies.wasm-bindgen]
-  version = "0.2"
-  optional = true
+[dependencies.wasm-bindgen]
+version = "0.2"
+optional = true
 
 [build-dependencies]
 snafu = "0.8"
 strum = "0.26"
 strum_macros = "0.26"
 
-  [build-dependencies.clap_complete]
-  version = "4.5"
-  optional = true
+[build-dependencies.clap_complete]
+version = "4.5"
+optional = true
 
-  [build-dependencies.clap_mangen]
-  version = "0.2"
-  optional = true
+[build-dependencies.clap_mangen]
+version = "0.2"
+optional = true
 
-  [build-dependencies.clap]
-  version = "4.5"
-  optional = true
-  features = ["derive"]
+[build-dependencies.clap]
+version = "4.5"
+optional = true
+features = ["derive"]
 
-  [build-dependencies.anyhow]
-  version = "1.0"
+[build-dependencies.anyhow]
+version = "1.0"
 
-  [build-dependencies.vergen-gix]
-  version = "1.0"
-  default-features = false
-  features = [ "build", "cargo", "rustc" ]
+[build-dependencies.vergen-gix]
+version = "1.0"
+default-features = false
+features = ["build", "cargo", "rustc"]
 
 [dev-dependencies]
 assert_cmd = "2.0"
@@ -107,6 +129,22 @@ predicates = "3.1"
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(build)'] }
 
+[package.metadata.bacon]
+default_job = "build"
+
+[package.metadata.bacon.jobs.build]
+command = ["cargo", "build", "--features", "full", "--color", "always"]
+
+[package.metadata.bacon.jobs.build-modules]
+command = [
+  "cargo",
+  "build",
+  "--features",
+  "modules,luajit",
+  "--color",
+  "always",
+]
+
 [package.metadata.docs.rs]
 features = ["luamodule", "luajit", "pythonmodule", "wasm", "unstable-trait"]
 rustdoc-args = ["--cfg", "docsrs"]
@@ -114,10 +152,10 @@ rustdoc-args = ["--cfg", "docsrs"]
 [package.metadata.git-cliff.git]
 protect_breaking_commits = true
 commit_parsers = [
-    { message = "^feat", group = "<!-- 0 -->Features" },
-    { message = "^fix", group = "<!-- 1 -->Bug Fixes" },
-    { message = "^perf", group = "<!-- 2 -->Performance" },
-    { message = ".*", skip = true },
+  { message = "^feat", group = "<!-- 0 -->Features" },
+  { message = "^fix", group = "<!-- 1 -->Bug Fixes" },
+  { message = "^perf", group = "<!-- 2 -->Performance" },
+  { message = ".*", skip = true },
 ]
 commit_preprocessors = [
   { pattern = '.*', replace_command = 'typos --quiet --write-changes -' },
@@ -125,9 +163,7 @@ commit_preprocessors = [
 
 [package.metadata.typos.default]
 locale = "en-us"
-extend-ignore-identifiers-re = [
-  "[bB][aA][zZ]"
-]
+extend-ignore-identifiers-re = ["[bB][aA][zZ]"]
 
 [package.metadata.typos.default.extend-words]
 runing = "running"

{decasify-0.8.0 → decasify-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: decasify
-Version: 0.8.0
+Version: 0.9.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
@@ -33,7 +33,7 @@ Project-URL: Source Code, https://github.com/alerque/decasify
 [![PyPi (latest)](https://img.shields.io/pypi/v/decasify?logo=python&color=blue)](https://pypi.org/project/decasify)
 [![NPM Version](https://img.shields.io/npm/v/decasify?logo=npm&color=blue)](https://www.npmjs.com/package/decasify)
 
-A CLI utility, Rust crate, Lua rock, Python module, JavaScript module, Neovim plugin, and SILE package to cast strings to title-case (and other cases) according to locale specific style guides including Turkish support.
+A CLI utility, Rust crate, Lua rock, Python module, JavaScript module, Neovim plugin, SILE package, and Typst package to cast strings to title-case (and other cases) according to locale specific style guides including Turkish support.
 
 This project was born out of frustration with authors and editors leaving ALL CAPS TITLES in Markdown sources.
 No tooling I could find properly supported casting these to title-cased strings (which are more versatile for typesetting purposes).
@@ -47,7 +47,7 @@ Where possible the APIs currently default to English rules and (for English) the
 
 The Turkish style follows the Turkish Language Institute's [guidelines][tdk].
 
-For English, three style guides are known: Associated Press (AP), Chicago Manual of Style (CMOS), and John Grubber's Daring Fireball (Gruber).
+For English, three style guides are known: Associated Press (AP), Chicago Manual of Style (CMOS), and John Gruber's Daring Fireball (Gruber).
 The Gruber style is by far the most complete, being implemented by the [titlecase crate][titlecase_crate].
 The CMOS style handles a number of parts of speech but has punctuation related issues.
 The AP style is largely unimplemented.
@@ -77,7 +77,8 @@ Foo BAR and Baz: An Alter Ego
 
 ### Installation
 
-To install, first check your distro for packages, e.g. for [Arch Linux](https://archlinux.org/packages/extra/x86_64/decasify/) just install via `pacman -S decasify`.
+<a href="https://repology.org/project/decasify/versions"><img src="https://repology.org/badge/vertical-allrepos/decasify.svg" align="right" alt="Packaging status"></a>
+To install, first check your distro for packages, e.g. for [Arch Linux](https://archlinux.org/packages/extra/x86_64/decasify/) just install via `pacman -S decasify` or for [Homebrew](https://formulae.brew.sh/formula/decasify) via `brew install decasify`.
 
 Otherwise for many platforms you can run it directly or install it to a shell using Nix Flakes:
 
@@ -113,7 +114,7 @@ In your `Cargo.toml` file.
 
 ```toml
 [dependencies]
-decasify = "0.8"
+decasify = "0.9"
 ```
 
 Then use the crate functions and types in your project something like this:
@@ -236,6 +237,19 @@ Loading it in a SILE document uses the usual `\use[module=package.decasify]` (se
 Once loaded the package exposes a `\decasify{}` function that can take any combination of `case`, `locale`, and `style` settings and applies the appropriate transformation to the content.
 By default it will track the language of the document content.
 
+## Use as a Typst package
+
+[Typst](https://typst.app/) has its own [package registry](https://typst.app/universe/).
+The [decasify](https://typst.app/universe/package/decasify) package can be added to your project with an import line.
+The exact version must be specified explicitly:
+
+```typst
+#import "@preview/decasify:0.8.0": *
+```
+
+Specific functions for each case should be available throughout the document.
+See the Typst package [readme](typst/README.md) or the [package listing on Typst universe](https://typst.app/universe/package/decasify) for more details.
+
 [rock]: http://luarocks.org/modules/alerque/decasify
 [rock.sile]: http://luarocks.org/modules/alerque/decasify.sile
 

{decasify-0.8.0 → decasify-0.9.0}/README.md

@@ -11,7 +11,7 @@
 [![PyPi (latest)](https://img.shields.io/pypi/v/decasify?logo=python&color=blue)](https://pypi.org/project/decasify)
 [![NPM Version](https://img.shields.io/npm/v/decasify?logo=npm&color=blue)](https://www.npmjs.com/package/decasify)
 
-A CLI utility, Rust crate, Lua rock, Python module, JavaScript module, Neovim plugin, and SILE package to cast strings to title-case (and other cases) according to locale specific style guides including Turkish support.
+A CLI utility, Rust crate, Lua rock, Python module, JavaScript module, Neovim plugin, SILE package, and Typst package to cast strings to title-case (and other cases) according to locale specific style guides including Turkish support.
 
 This project was born out of frustration with authors and editors leaving ALL CAPS TITLES in Markdown sources.
 No tooling I could find properly supported casting these to title-cased strings (which are more versatile for typesetting purposes).
@@ -25,7 +25,7 @@ Where possible the APIs currently default to English rules and (for English) the
 
 The Turkish style follows the Turkish Language Institute's [guidelines][tdk].
 
-For English, three style guides are known: Associated Press (AP), Chicago Manual of Style (CMOS), and John Grubber's Daring Fireball (Gruber).
+For English, three style guides are known: Associated Press (AP), Chicago Manual of Style (CMOS), and John Gruber's Daring Fireball (Gruber).
 The Gruber style is by far the most complete, being implemented by the [titlecase crate][titlecase_crate].
 The CMOS style handles a number of parts of speech but has punctuation related issues.
 The AP style is largely unimplemented.
@@ -55,7 +55,8 @@ Foo BAR and Baz: An Alter Ego
 
 ### Installation
 
-To install, first check your distro for packages, e.g. for [Arch Linux](https://archlinux.org/packages/extra/x86_64/decasify/) just install via `pacman -S decasify`.
+<a href="https://repology.org/project/decasify/versions"><img src="https://repology.org/badge/vertical-allrepos/decasify.svg" align="right" alt="Packaging status"></a>
+To install, first check your distro for packages, e.g. for [Arch Linux](https://archlinux.org/packages/extra/x86_64/decasify/) just install via `pacman -S decasify` or for [Homebrew](https://formulae.brew.sh/formula/decasify) via `brew install decasify`.
 
 Otherwise for many platforms you can run it directly or install it to a shell using Nix Flakes:
 
@@ -91,7 +92,7 @@ In your `Cargo.toml` file.
 
 ```toml
 [dependencies]
-decasify = "0.8"
+decasify = "0.9"
 ```
 
 Then use the crate functions and types in your project something like this:
@@ -214,5 +215,18 @@ Loading it in a SILE document uses the usual `\use[module=package.decasify]` (se
 Once loaded the package exposes a `\decasify{}` function that can take any combination of `case`, `locale`, and `style` settings and applies the appropriate transformation to the content.
 By default it will track the language of the document content.
 
+## Use as a Typst package
+
+[Typst](https://typst.app/) has its own [package registry](https://typst.app/universe/).
+The [decasify](https://typst.app/universe/package/decasify) package can be added to your project with an import line.
+The exact version must be specified explicitly:
+
+```typst
+#import "@preview/decasify:0.8.0": *
+```
+
+Specific functions for each case should be available throughout the document.
+See the Typst package [readme](typst/README.md) or the [package listing on Typst universe](https://typst.app/universe/package/decasify) for more details.
+
 [rock]: http://luarocks.org/modules/alerque/decasify
 [rock.sile]: http://luarocks.org/modules/alerque/decasify.sile

{decasify-0.8.0 → decasify-0.9.0}/src/content.rs

@@ -3,20 +3,27 @@
 
 use regex::Regex;
 use std::{borrow::Cow, fmt, fmt::Display, str::FromStr};
+use unicode_titlecase::StrTitleCase;
 
 use snafu::prelude::*;
 
+#[derive(Clone, Debug)]
+#[non_exhaustive]
+pub struct Chunk {
+    pub segments: Vec<Segment>,
+}
+
 #[derive(Clone, Debug, PartialEq)]
 #[non_exhaustive]
 pub enum Segment {
     Separator(String),
-    Word(String),
+    Word(Word),
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq)]
 #[non_exhaustive]
-pub struct Chunk {
-    pub segments: Vec<Segment>,
+pub struct Word {
+    pub word: String,
 }
 
 #[derive(Snafu)]
@@ -42,7 +49,9 @@ fn split_chunk(s: &str) -> Chunk {
         if let Some(m) = capture.name("separator") {
             segments.push(Segment::Separator(m.as_str().to_string()));
         } else if let Some(m) = capture.name("word") {
-            segments.push(Segment::Word(m.as_str().to_string()));
+            segments.push(Segment::Word(Word {
+                word: m.as_str().to_owned(),
+            }));
         }
     }
     Chunk { segments }
@@ -79,13 +88,13 @@ impl FromStr for Chunk {
     }
 }
 
-impl Display for Segment {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let _ = match self {
-            Segment::Separator(string) => fmt.write_str(string),
-            Segment::Word(string) => fmt.write_str(string),
-        };
-        Ok(())
+impl From<Chunk> for String {
+    fn from(c: Chunk) -> Self {
+        let mut s = String::new();
+        for segment in c.segments {
+            s.push_str(segment.to_string().as_ref());
+        }
+        s
     }
 }
 
@@ -97,3 +106,56 @@ impl Display for Chunk {
         Ok(())
     }
 }
+
+impl Display for Segment {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Segment::Separator(string) => fmt.write_str(string)?,
+            Segment::Word(word) => fmt.write_str(word.to_string().as_ref())?,
+        };
+        Ok(())
+    }
+}
+
+impl Word {
+    pub fn to_lowercase(&self) -> String {
+        self.word.to_lowercase()
+    }
+    pub fn to_uppercase(&self) -> String {
+        self.word.to_uppercase()
+    }
+}
+
+impl From<String> for Word {
+    fn from(word: String) -> Self {
+        Self { word }
+    }
+}
+
+impl StrTitleCase for Word {
+    fn to_titlecase(&self) -> String {
+        self.word.to_titlecase()
+    }
+    fn to_titlecase_lower_rest(&self) -> String {
+        self.word.to_titlecase_lower_rest()
+    }
+    fn to_titlecase_tr_or_az(&self) -> String {
+        self.word.to_titlecase_tr_or_az()
+    }
+    fn to_titlecase_tr_or_az_lower_rest(&self) -> String {
+        self.word.to_titlecase_tr_or_az_lower_rest()
+    }
+    fn starts_titlecase(&self) -> bool {
+        self.word.starts_titlecase()
+    }
+    fn starts_titlecase_rest_lower(&self) -> bool {
+        self.word.starts_titlecase_rest_lower()
+    }
+}
+
+impl Display for Word {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.write_str(self.word.as_ref())?;
+        Ok(())
+    }
+}

{decasify-0.8.0 → decasify-0.9.0}/src/en.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: © 2023 Caleb Maclennan <caleb@alerque.com>
 // SPDX-License-Identifier: LGPL-3.0-only
 
-use crate::content::{Chunk, Segment};
+use crate::content::{Chunk, Segment, Word};
 use crate::types::StyleGuide;
 
 use regex::Regex;
@@ -20,32 +20,32 @@ pub fn titlecase(chunk: Chunk, style: StyleGuide) -> String {
 
 fn titlecase_ap(chunk: Chunk) -> String {
     eprintln!("AP style guide not implemented, string returned as-is!");
-    chunk.to_string()
+    chunk.into()
 }
 
 fn titlecase_cmos(chunk: Chunk) -> String {
-    let mut done_first = false;
     let mut chunk = chunk.clone();
-    let mut segments = chunk.segments.iter_mut().peekable();
-    while let Some(segment) = segments.next() {
-        if let Segment::Word(s) = segment {
-            *s = if !done_first {
-                done_first = true;
-                s.to_string().to_titlecase_lower_rest()
-            } else if segments.peek().is_none() {
-                // TODO: I think a bug is hiding here since peek() might give use a separator
-                // that happens to be a trailing trivia. We need a custom iterator or peeker
-                // that knows how to answer about first/last *word* segments.
-                s.to_string().to_titlecase_lower_rest()
-            } else {
-                match is_reserved(s.to_string()) {
-                    true => s.to_string().to_lowercase(),
-                    false => s.to_string().to_titlecase_lower_rest(),
-                }
-            }
-        }
+    let mut words = chunk
+        .segments
+        .iter_mut()
+        .filter_map(|segment| match segment {
+            Segment::Word(word) => Some(word),
+            _ => None,
+        })
+        .peekable();
+    if let Some(word) = words.next() {
+        word.word = word.to_titlecase_lower_rest();
+    }
+    while let Some(word) = words.next() {
+        word.word = match words.peek().is_none() {
+            true => word.to_titlecase_lower_rest(),
+            false => match is_reserved(word) {
+                true => word.to_lowercase(),
+                false => word.to_titlecase_lower_rest(),
+            },
+        };
     }
-    chunk.to_string()
+    chunk.into()
 }
 
 fn titlecase_gruber(chunk: Chunk) -> String {
@@ -61,11 +61,11 @@ fn titlecase_gruber(chunk: Chunk) -> String {
     } else {
         String::from("")
     };
-    let titilized = gruber_titlecase(&chunk.to_string());
+    let titilized = gruber_titlecase(chunk.to_string().as_ref());
     format!("{}{}{}", leading_trivia, titilized, trailing_trivia)
 }
 
-fn is_reserved(word: String) -> bool {
+fn is_reserved(word: &Word) -> bool {
     let word = word.to_lowercase();
     let word = word.as_str();
     let article = Regex::new(r"^(a|an|the)$").unwrap();
@@ -77,35 +77,35 @@ fn is_reserved(word: String) -> bool {
 pub fn lowercase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = s.to_string().to_lowercase()
+        if let Segment::Word(word) = segment {
+            word.word = word.to_lowercase()
         }
     });
-    chunk.to_string()
+    chunk.into()
 }
 
 pub fn uppercase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = s.to_string().to_uppercase()
+        if let Segment::Word(word) = segment {
+            word.word = word.to_uppercase()
         }
     });
-    chunk.to_string()
+    chunk.into()
 }
 
 pub fn sentencecase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     let mut done_first = false;
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = if !done_first {
+        if let Segment::Word(word) = segment {
+            word.word = if !done_first {
                 done_first = true;
-                s.to_string().to_titlecase_lower_rest()
+                word.to_titlecase_lower_rest()
             } else {
-                s.to_string().to_lowercase()
+                word.to_lowercase()
             }
         }
     });
-    chunk.to_string()
+    chunk.into()
 }

{decasify-0.8.0 → decasify-0.9.0}/src/tr.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: © 2023 Caleb Maclennan <caleb@alerque.com>
 // SPDX-License-Identifier: LGPL-3.0-only
 
-use crate::content::{Chunk, Segment};
+use crate::content::{Chunk, Segment, Word};
 use crate::types::StyleGuide;
 
 use regex::Regex;
@@ -20,63 +20,63 @@ fn titlecase_tdk(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     let mut done_first = false;
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = if !done_first {
+        if let Segment::Word(word) = segment {
+            word.word = if !done_first {
                 done_first = true;
-                s.to_string().to_titlecase_tr_or_az_lower_rest()
+                word.to_titlecase_tr_or_az_lower_rest()
             } else {
-                match is_reserved(s.to_string()) {
-                    true => s.to_string().to_lowercase_tr_az(),
-                    false => s.to_titlecase_tr_or_az_lower_rest(),
+                match is_reserved(word) {
+                    true => word.word.to_lowercase_tr_az(),
+                    false => word.word.to_titlecase_tr_or_az_lower_rest(),
                 }
             }
         }
     });
-    chunk.to_string()
+    chunk.into()
 }
 
-fn is_reserved(word: String) -> bool {
-    let baglac = Regex::new(
-        r"^([Vv][Ee]|[İi][Ll][Ee]|[Yy][Aa]|[Vv][Ee]|[Yy][Aa][Hh][Uu][Tt]|[Kk][İi]|[Dd][AaEe])$",
-    )
-    .unwrap();
+fn is_reserved(word: &Word) -> bool {
+    let word = word.to_string();
+    let word = word.as_ref();
+    let baglac =
+        Regex::new(r"^([Vv][Ee]|[İi][Ll][Ee]|[Yy][Aa]|[Yy][Aa][Hh][Uu][Tt]|[Kk][İi]|[Dd][AaEe])$")
+            .unwrap();
     let soruek = Regex::new(r"^([Mm][İiIıUuÜü])([Dd][İiIıUuÜü][Rr]([Ll][AaEe][Rr])?|[Ss][İiIıUuÜü][Nn]|[Yy][İiIıUuÜü][Zz]|[Ss][İiIıUuÜü][Nn][İiIıUuÜü][Zz]|[Ll][AaEe][Rr])?$").unwrap();
-    let word = word.as_str();
     baglac.is_match(word) || soruek.is_match(word)
 }
 
 pub fn lowercase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = s.to_string().to_lowercase_tr_az()
+        if let Segment::Word(word) = segment {
+            word.word = word.word.to_lowercase_tr_az()
         }
     });
-    chunk.to_string()
+    chunk.into()
 }
 
 pub fn uppercase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = s.to_string().to_uppercase_tr_az()
+        if let Segment::Word(word) = segment {
+            word.word = word.word.to_uppercase_tr_az()
         }
     });
-    chunk.to_string()
+    chunk.into()
 }
 
 pub fn sentencecase(chunk: Chunk) -> String {
     let mut chunk = chunk.clone();
     let mut done_first = false;
     chunk.segments.iter_mut().for_each(|segment| {
-        if let Segment::Word(s) = segment {
-            *s = if !done_first {
+        if let Segment::Word(word) = segment {
+            word.word = if !done_first {
                 done_first = true;
-                s.to_string().to_titlecase_tr_or_az_lower_rest()
+                word.word.to_titlecase_tr_or_az_lower_rest()
             } else {
-                s.to_string().to_lowercase_tr_az()
+                word.word.to_lowercase_tr_az()
             }
         }
     });
-    chunk.to_string()
+    chunk.into()
 }

{decasify-0.8.0 → decasify-0.9.0}/src/types.rs

@@ -84,8 +84,8 @@ impl FromStr for Locale {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self> {
         match s.to_ascii_lowercase().as_str() {
-            "en" | "English" | "en_en" => Ok(Locale::EN),
-            "tr" | "Turkish" | "tr_tr" | "türkçe" => Ok(Locale::TR),
+            "en" | "english" | "en_en" => Ok(Locale::EN),
+            "tr" | "turkish" | "tr_tr" | "türkçe" => Ok(Locale::TR),
             input => LocaleSnafu { input }.fail()?,
         }
     }
@@ -109,6 +109,13 @@ impl From<&String> for Locale {
     }
 }
 
+impl From<&[u8]> for Locale {
+    fn from(s: &[u8]) -> Self {
+        let s = String::from_utf8(s.to_vec()).unwrap();
+        Self::from_str(s.as_ref()).unwrap()
+    }
+}
+
 impl FromStr for Case {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self> {
@@ -140,6 +147,13 @@ impl From<&String> for Case {
     }
 }
 
+impl From<&[u8]> for Case {
+    fn from(s: &[u8]) -> Self {
+        let s = String::from_utf8(s.to_vec()).unwrap();
+        Self::from_str(s.as_ref()).unwrap()
+    }
+}
+
 impl FromStr for StyleGuide {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self> {
@@ -174,6 +188,13 @@ impl From<&String> for StyleGuide {
     }
 }
 
+impl From<&[u8]> for StyleGuide {
+    fn from(s: &[u8]) -> Self {
+        let s = String::from_utf8(s.to_vec()).unwrap();
+        Self::from_str(s.as_ref()).unwrap()
+    }
+}
+
 impl From<Option<StyleGuide>> for StyleGuide {
     fn from(style: Option<StyleGuide>) -> Self {
         match style {

{decasify-0.8.0 → decasify-0.9.0}/tests/lib.rs

@@ -65,6 +65,24 @@ case!(
     "a b c"
 );
 
+case!(
+    trivia_en,
+    Case::Title,
+    Locale::EN,
+    StyleGuide::LanguageDefault,
+    "  foo  bar  ",
+    "  Foo  Bar  "
+);
+
+case!(
+    trivia_tr,
+    Case::Title,
+    Locale::TR,
+    StyleGuide::LanguageDefault,
+    "  foo  bar  ",
+    "  Foo  Bar  "
+);
+
 macro_rules! titlecase {
     ($name:ident, $locale:expr, $style:expr, $input:expr, $expected:expr) => {
         #[test]