added numbers to strokes

src/anim_cjk.rs

@@ -6,12 +6,21 @@ pub struct GraphicsEntry {
  pub character: char,
  pub strokes: Vec<String>,
  #[allow(unused)]
- medians: Vec<Vec<(f32, f32)>>, // TODO: use this for automatic checking if character was drawn correctly?
+ medians: Vec<Vec<(i32, i32)>>, // TODO: use this for automatic checking if character was drawn correctly?
 }
 impl From<GraphicsEntry> for WordEntry {
  fn from(o: GraphicsEntry) -> Self {
  let mut w = WordEntry::from_id(o.character.into());
- w.writing = vec![CharWriting::Strokes(o.strokes)];
+ w.writing = vec![CharWriting::Strokes(
+ o.strokes
+ .into_iter()
+ .zip(o.medians.into_iter())
+ .map(|(s, m)| Stroke {
+ path: s,
+ start: m[0],
+ })
+ .collect(),
+ )];
  w
  }
 }

src/anki.rs

@@ -199,17 +199,31 @@ fn anki_canvas_contrast(idx: usize) -> String {
  let (r, g, b) = rgb(h, s, v);
  format!("#{:02x}{:02x}{:02x}", r, g, b)
 }
-fn svg_from_strokes(strokes: Vec<String>, i0: usize) -> String {
+fn svg_from_strokes(strokes: Vec<Stroke>, i0: usize) -> String {
  format!(
- r#"<svg class="charvg" viewbox="0 0 1024 1024"><g transform="scale(1, -1) translate(0, -900)">{}</g></svg>"#,
+ r#"<svg class="charvg" viewbox="0 0 1024 1024"><g transform="scale(1, -1) translate(0, -900)">{}</g>{}</svg>"#,
  strokes
  .iter()
  .enumerate()
- .map(|(i, stroke)| format!(
- r#"<path d="{}" fill="{}"></path>"#,
- stroke,
- anki_canvas_contrast(i0 + i)
- ))
+ .map(|(i, stroke)| {
+ format!(
+ r#"<path d="{}" fill="{}"></path>"#,
+ stroke.path,
+ anki_canvas_contrast(i0 + i),
+ )
+ })
+ .fold(String::new(), |acc, e| acc + &e),
+ strokes
+ .iter()
+ .enumerate()
+ .map(|(i, stroke)| {
+ format!(
+ r#"<text x="{}" y="{}" stroke="white" fill="black">{}</text>"#,
+ stroke.start.0,
+ 900 - stroke.start.1,
+ i0 + i + 1
+ )
+ })
  .fold(String::new(), |acc, e| acc + &e)
  )
 }
@@ -225,10 +239,13 @@ fn html_from_writing(w: Vec<CharWriting>) -> String {
  for c in w.into_iter() {
  let ns = match &c {
  CharWriting::Strokes(strokes) => strokes.len(),
- CharWriting::Char(_c) => 1,
+ CharWriting::Char(_c) => 0,
  };
  cw.push(html_from_char_writing(c, i0));
  i0 += ns;
+ if ns == 0 {
+ i0 = 0;
+ }
  }
  format!(r#"<p class="tc">{}</p>"#, cw.join(""))
 }

src/common.rs

@@ -54,9 +54,14 @@ pub struct Priority {
  pub max: NotNan<f32>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Stroke {
+ pub path: String,
+ pub start: (i32, i32),
+}
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum CharWriting {
- Strokes(Vec<String>),
+ Strokes(Vec<Stroke>),
  Char(char),
 }
 

src/main.rs

@@ -180,6 +180,7 @@ fn debug_entries(entries: Vec<CommonEntry>) {
  }
 }
 
+//TODO: make it clear where the strokes begin
 fn main() {
  //cache_entries();return;
  let entries = get_cached_entries();