Skip to content

Commit

Permalink
Update MFEK clap fork to 3.0.5
Browse files Browse the repository at this point in the history
Although I once thought that it's likely we'd be able to go back to
master `clap`, MFEK might have to maintain its fork indefinitely.

`clap`'s maintainer @epage unfortunately wrote in clap-rs/clap#3008:

>  We might find it just isn't worth completing this.
  • Loading branch information
ctrlcctrlv committed Jan 11, 2022
1 parent e3cef6e commit ebdddc7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
22 changes: 12 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"

[dependencies]
# parse command line arguments
clap = { git = "https://github.com/MFEK/clap.rlib", branch = "validator_all" }
clap = { git = "https://github.com/MFEK/clap.rlib", branch = "master" }

# parses .glif files
glifparser = { git = "https://github.com/MFEK/glifparser.rlib", branch = "master", features=["mfek"] }
Expand Down
2 changes: 1 addition & 1 deletion src/constant_width_stroke.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ pub fn cws_cli(matches: &clap::ArgMatches) {
width: path.width,
unicode: path.unicode,
name: path.name,
lib: None,
lib: path.lib,
components: path.components,
guidelines: path.guidelines,
images: path.images,
Expand Down
8 changes: 4 additions & 4 deletions src/nib_stroke.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ pub fn clap_app() -> clap::App<'static> {
.short('n')
.long("nib")
.takes_value(true)
.about("The path to the nib file. FontForge is quite strict about these. The .glif must contain a single closed spline, running clockwise, which represents a convex shape.")
.help("The path to the nib file. FontForge is quite strict about these. The .glif must contain a single closed spline, running clockwise, which represents a convex shape.")
.required(true))
.arg(Arg::new("input")
.display_order(2)
.short('i')
.long("input")
.takes_value(true)
.about("The path to the input path file.")
.help("The path to the input path file.")
.required(true))
.arg(Arg::new("output")
.display_order(3)
.short('o')
.long("output")
.takes_value(true)
.about("The path where the output .glif will be saved.")
.help("The path where the output .glif will be saved.")
.required(true))
.arg(Arg::new("accuracy")
.display_order(4)
.short('a')
.long("accuracy")
.takes_value(true)
.default_value("0.25")
.about("<f64> Accuracy target")
.help("<f64> Accuracy target")
.validator(super::arg_validator_positive_f64)
.required(false))
}
Expand Down

0 comments on commit ebdddc7

Please sign in to comment.