merge text contained in non-block compo

graham-eisele · Sep 14, 2021 · 31becff · 31becff
1 parent f49daa2
commit 31becff
Show file tree

Hide file tree

Showing 58 changed files with 4,911 additions and 504 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/data/input/10.jpg b/data/input/10.jpg
diff --git a/data/input/11.jpg b/data/input/11.jpg
diff --git a/data/output/clips/Compo/0.jpg b/data/output/clips/Compo/0.jpg
diff --git a/data/output/clips/Compo/1.jpg b/data/output/clips/Compo/1.jpg
diff --git a/data/output/clips/Compo/10.jpg b/data/output/clips/Compo/10.jpg
diff --git a/data/output/clips/Compo/11.jpg b/data/output/clips/Compo/11.jpg
diff --git a/data/output/clips/Compo/12.jpg b/data/output/clips/Compo/12.jpg
diff --git a/data/output/clips/Compo/13.jpg b/data/output/clips/Compo/13.jpg
diff --git a/data/output/clips/Compo/14.jpg b/data/output/clips/Compo/14.jpg
diff --git a/data/output/clips/Compo/15.jpg b/data/output/clips/Compo/15.jpg
diff --git a/data/output/clips/Compo/16.jpg b/data/output/clips/Compo/16.jpg
diff --git a/data/output/clips/Compo/17.jpg b/data/output/clips/Compo/17.jpg
diff --git a/data/output/clips/Compo/18.jpg b/data/output/clips/Compo/18.jpg
diff --git a/data/output/clips/Compo/19.jpg b/data/output/clips/Compo/19.jpg
diff --git a/data/output/clips/Compo/2.jpg b/data/output/clips/Compo/2.jpg
diff --git a/data/output/clips/Compo/3.jpg b/data/output/clips/Compo/3.jpg
diff --git a/data/output/clips/Compo/4.jpg b/data/output/clips/Compo/4.jpg
diff --git a/data/output/clips/Compo/5.jpg b/data/output/clips/Compo/5.jpg
diff --git a/data/output/clips/Compo/6.jpg b/data/output/clips/Compo/6.jpg
diff --git a/data/output/clips/Compo/7.jpg b/data/output/clips/Compo/7.jpg
diff --git a/data/output/clips/Compo/8.jpg b/data/output/clips/Compo/8.jpg
diff --git a/data/output/clips/Compo/9.jpg b/data/output/clips/Compo/9.jpg
diff --git a/data/output/clips/Text/20.jpg b/data/output/clips/Text/20.jpg
diff --git a/data/output/clips/Text/21.jpg b/data/output/clips/Text/21.jpg
diff --git a/data/output/clips/bkg.png b/data/output/clips/bkg.png