decasify 0.11.1__tar.gz → 0.11.2__tar.gz

{decasify-0.11.1 → decasify-0.11.2}/Cargo.lock

@@ -67,22 +67,22 @@ dependencies = [
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.45"
+version = "1.2.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
+checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -191,9 +191,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
-version = "4.5.51"
+version = "4.5.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
+checksum = "aa8120877db0e5c011242f96806ce3c94e0737ab8108532a76a3300a01db2ab8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -201,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.51"
+version = "4.5.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
+checksum = "02576b399397b659c26064fbc92a75fede9d18ffd5f80ca1cd74ddab167016e1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -307,7 +307,7 @@ dependencies = [
 
 [[package]]
 name = "decasify"
-version = "0.11.1"
+version = "0.11.2"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -435,9 +435,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
 
 [[package]]
 name = "flate2"
@@ -1977,7 +1977,7 @@ dependencies = [
 
 [[package]]
 name = "typst"
-version = "0.11.1"
+version = "0.11.2"
 dependencies = [
  "anyhow",
  "decasify",

{decasify-0.11.1 → decasify-0.11.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "decasify"
-version = "0.11.1"
+version = "0.11.2"
 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"
@@ -13,7 +13,7 @@ repository.workspace = true
 license.workspace = true
 
 [workspace.package]
-version = "0.11.1"
+version = "0.11.2"
 authors = ["Caleb Maclennan <caleb@alerque.com>"]
 homepage = "https://github.com/alerque/decasify"
 repository = "https://github.com/alerque/decasify"
@@ -64,7 +64,7 @@ wasm = ["dep:wasm-bindgen"]
 
 [workspace.dependencies.decasify]
 path = "."
-version = "0.11.1"
+version = "0.11.2"
 
 [dependencies]
 regex = "1.11"

{decasify-0.11.1 → decasify-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: decasify
-Version: 0.11.1
+Version: 0.11.2
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English

{decasify-0.11.1 → decasify-0.11.2}/README.md

@@ -23,6 +23,10 @@ The CLI defaults to titlecase and English, but lower, upper, and sentence case o
 The Rust, Lua, Python, and JavaScript library APIs have functions specific to each operation.
 Where possible the APIs currently default to English rules and (for English) the Gruber style guide, but others are available.
 
+The Spanish style roughly follows [optional stylistic exceptions](https://www.rae.es/dpd/may%C3%BAsculas) noted by Real Academia Española.
+Keep in mind most Spanish style guides eschew title casing and use sentence-case for many things that would traditionally be title-cased in English.
+This library implements a best-guess at title-casing when asked to, it does not help you understand when (not) to use it in the first place.
+
 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 Gruber's Daring Fireball (Gruber).
@@ -259,7 +263,7 @@ The [decasify](https://typst.app/universe/package/decasify) package can be added
 The exact version must be specified explicitly:
 
 ```typst
-#import "@preview/decasify:0.11.1": *
+#import "@preview/decasify:0.11.2": *
 ```
 
 Specific functions for each case should be available throughout the document.

decasify-0.11.2/src/es.rs

@@ -0,0 +1,97 @@
+// SPDX-FileCopyrightText: © 2023 Caleb Maclennan <caleb@alerque.com>
+// SPDX-License-Identifier: LGPL-3.0-only
+
+use crate::content::{Chunk, Segment};
+use crate::get_override;
+use crate::types::{StyleGuide, StyleOptions, Word};
+
+use unicode_titlecase::StrTitleCase;
+
+pub fn titlecase(chunk: Chunk, style: StyleGuide, opts: StyleOptions) -> String {
+    let articles_prepositions_conjunctions = [
+        "a", "al", "ante", "bajo", "con", "contra", "de", "del", "desde", "durante", "e", "el",
+        "en", "entre", "hacia", "hasta", "la", "las", "los", "mas", "mediante", "ni", "o", "para",
+        "pero", "por", "que", "según", "si", "sin", "so", "sino", "sobre", "tras", "u", "un",
+        "una", "unas", "unos", "y",
+    ];
+    let determiners = [
+        "mi", "mis", "nuestro", "nuestra", "nuestros", "nuestras", "tu", "tus", "vuestro",
+        "vuestra", "vuestros", "vuestras", "su", "sus",
+    ];
+    match style {
+        StyleGuide::LanguageDefault => {
+            titlecase_spanish(chunk, opts, &articles_prepositions_conjunctions)
+        }
+        StyleGuide::RealAcademiaEspanola => {
+            titlecase_spanish(chunk, opts, &articles_prepositions_conjunctions)
+        }
+        StyleGuide::FundeuRealAcademiaEspanola => {
+            let mut combined = articles_prepositions_conjunctions.to_vec();
+            combined.extend_from_slice(&determiners);
+            titlecase_spanish(chunk, opts, &combined)
+        }
+        _ => todo!("Spanish implementation doesn't support this style guide."),
+    }
+}
+
+fn titlecase_spanish(chunk: Chunk, opts: StyleOptions, reserved_words: &[&str]) -> String {
+    let mut chunk = chunk.clone();
+    let mut done_first = false;
+    chunk.segments.iter_mut().for_each(|segment| {
+        if let Segment::Word(word) = segment {
+            word.word =
+                if let Some(word) = get_override(word, &opts.overrides, |w| w.to_lowercase()) {
+                    word.to_string()
+                } else if !done_first {
+                    done_first = true;
+                    word.to_titlecase_lower_rest()
+                } else {
+                    match is_reserved(word, reserved_words) {
+                        true => word.word.to_lowercase(),
+                        false => word.word.to_titlecase_lower_rest(),
+                    }
+                }
+        }
+    });
+    chunk.into()
+}
+
+fn is_reserved(word: &Word, reserved_words: &[&str]) -> bool {
+    reserved_words.contains(&word.word.to_lowercase().as_str())
+}
+
+pub fn lowercase(chunk: Chunk) -> String {
+    let mut chunk = chunk.clone();
+    chunk.segments.iter_mut().for_each(|segment| {
+        if let Segment::Word(word) = segment {
+            word.word = word.to_lowercase()
+        }
+    });
+    chunk.into()
+}
+
+pub fn uppercase(chunk: Chunk) -> String {
+    let mut chunk = chunk.clone();
+    chunk.segments.iter_mut().for_each(|segment| {
+        if let Segment::Word(word) = segment {
+            word.word = word.to_uppercase()
+        }
+    });
+    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(word) = segment {
+            word.word = if !done_first {
+                done_first = true;
+                word.to_titlecase_lower_rest()
+            } else {
+                word.to_lowercase()
+            }
+        }
+    });
+    chunk.into()
+}

{decasify-0.11.1 → decasify-0.11.2}/src/lib.rs

@@ -31,6 +31,7 @@ pub mod python;
 pub mod wasm;
 
 mod en;
+mod es;
 mod tr;
 
 /// Convert a string to a specific case following typesetting conventions for a target locale
@@ -85,6 +86,7 @@ where
     let opts: StyleOptions = opts.try_into()?;
     Ok(match locale {
         Locale::EN => en::titlecase(chunk, style, opts),
+        Locale::ES => es::titlecase(chunk, style, opts),
         Locale::TR => tr::titlecase(chunk, style, opts),
     })
 }
@@ -99,6 +101,7 @@ where
     let locale: Locale = locale.try_into()?;
     Ok(match locale {
         Locale::EN => en::lowercase(chunk),
+        Locale::ES => es::lowercase(chunk),
         Locale::TR => tr::lowercase(chunk),
     })
 }
@@ -113,6 +116,7 @@ where
     let locale: Locale = locale.try_into()?;
     Ok(match locale {
         Locale::EN => en::uppercase(chunk),
+        Locale::ES => es::uppercase(chunk),
         Locale::TR => tr::uppercase(chunk),
     })
 }
@@ -127,6 +131,7 @@ where
     let locale: Locale = locale.try_into()?;
     Ok(match locale {
         Locale::EN => en::sentencecase(chunk),
+        Locale::ES => es::sentencecase(chunk),
         Locale::TR => tr::sentencecase(chunk),
     })
 }

{decasify-0.11.1 → decasify-0.11.2}/src/types.rs

@@ -53,6 +53,10 @@ pub struct Word {
     pub word: String,
 }
 
+// WARNING: These enums can't change order when adding new variants because some modules cast them
+// to integers, and that would make for ABI breakage. The variants can be re-sorted (alphabetically
+// or logically or whatever) when a major version with no ABI compatibility guarantees is okay.
+
 /// Locale selector to change language support rules of case functions.
 #[derive(Default, Display, VariantNames, Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "pythonmodule", pyclass(eq))]
@@ -63,6 +67,7 @@ pub enum Locale {
     #[default]
     EN,
     TR,
+    ES,
 }
 
 /// Target case selector.
@@ -98,6 +103,10 @@ pub enum StyleGuide {
     LanguageDefault,
     #[strum(serialize = "tdk")]
     TurkishLanguageInstitute,
+    #[strum(serialize = "rae")]
+    RealAcademiaEspanola,
+    #[strum(serialize = "fundeu")]
+    FundeuRealAcademiaEspanola,
 }
 
 #[derive(Clone, Debug, Default, PartialEq)]
@@ -180,7 +189,8 @@ impl FromStr for Locale {
     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),
+            "es" | "spanish" | "es_es" | "espanol" | "español" => Ok(Locale::ES),
+            "tr" | "turkish" | "tr_tr" | "turkce" | "türkçe" => Ok(Locale::TR),
             input => LocaleSnafu { input }.fail()?,
         }
     }
@@ -266,6 +276,8 @@ impl FromStr for StyleGuide {
             "daringfireball" | "gruber" | "fireball" => Ok(StyleGuide::DaringFireball),
             "associatedpress" | "ap" => Ok(StyleGuide::AssociatedPress),
             "chicagoManualofstyle" | "chicago" | "cmos" => Ok(StyleGuide::ChicagoManualOfStyle),
+            "fundeu" | "fundeurealacademiaespanola" => Ok(StyleGuide::FundeuRealAcademiaEspanola),
+            "rae" | "realacademiaespanola" => Ok(StyleGuide::RealAcademiaEspanola),
             "tdk" | "turkishlanguageinstitute" => Ok(StyleGuide::TurkishLanguageInstitute),
             "default" | "languagedefault" | "language" | "none" | "" => {
                 Ok(StyleGuide::LanguageDefault)

{decasify-0.11.1 → decasify-0.11.2}/tests/lib.rs

@@ -90,6 +90,16 @@ case!(
     "  Foo  Bar  "
 );
 
+case!(
+    trivia_es,
+    Case::Title,
+    Locale::ES,
+    StyleGuide::LanguageDefault,
+    StyleOptions::default(),
+    "  foo  bar  ",
+    "  Foo  Bar  "
+);
+
 case!(
     trivia_tr,
     Case::Title,
@@ -199,6 +209,51 @@ titlecase!(
     "  Free  Trolling\n  Space  "
 );
 
+titlecase!(
+    rae_articles,
+    Locale::ES,
+    StyleGuide::LanguageDefault,
+    StyleOptions::default(),
+    "el libro del autor",
+    "El Libro del Autor"
+);
+
+titlecase!(
+    rae_holiday,
+    Locale::ES,
+    StyleGuide::RealAcademiaEspanola,
+    StyleOptions::default(),
+    "DÍA DE los muertos",
+    "Día de los Muertos"
+);
+
+titlecase!(
+    rae_magazine,
+    Locale::ES,
+    StyleGuide::RealAcademiaEspanola,
+    StyleOptions::default(),
+    "cien años DE soledad",
+    "Cien Años de Soledad"
+);
+
+titlecase!(
+    rae_prepositions,
+    Locale::ES,
+    StyleGuide::LanguageDefault,
+    StyleOptions::default(),
+    "en la casa de mi madre",
+    "En la Casa de Mi Madre"
+);
+
+titlecase!(
+    fundu_prepositions,
+    Locale::ES,
+    StyleGuide::FundeuRealAcademiaEspanola,
+    StyleOptions::default(),
+    "en la casa de mi madre",
+    "En la Casa de mi Madre"
+);
+
 titlecase!(
     turkish_question,
     Locale::TR,
@@ -256,6 +311,8 @@ macro_rules! lowercase {
 
 lowercase!(lower_en, Locale::EN, "foo BAR BaZ BIKE", "foo bar baz bike");
 
+lowercase!(lower_es, Locale::ES, "Hola MUNDO", "hola mundo");
+
 lowercase!(
     lower_tr,
     Locale::TR,
@@ -275,6 +332,8 @@ macro_rules! uppercase {
 
 uppercase!(upper_en, Locale::EN, "foo BAR BaZ bike", "FOO BAR BAZ BIKE");
 
+uppercase!(upper_es, Locale::ES, "hola MUNDo", "HOLA MUNDO");
+
 uppercase!(
     upper_tr,
     Locale::TR,
@@ -299,4 +358,6 @@ sentencecase!(
     "Insert bike here"
 );
 
+sentencecase!(sentence_es, Locale::ES, "hola MUNDO", "Hola mundo");
+
 sentencecase!(sentence_tr, Locale::TR, "ilk DAVRANSIN", "İlk davransın");