From d8dc7b7649eb829a9ceb5ba61c895b2ff40fe1b6 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Tue, 3 Sep 2019 16:36:13 +0200 Subject: [PATCH] fixed name conflict in svg trees between files --- eittlanda.org | 12 +- img/eittlanda/vowel-feature-tree.svg | 334 +++++-------- img/nyqy/consonant-feature-tree.svg | 682 ++++----------------------- img/nyqy/vowel-feature-tree.svg | 348 ++++---------- nyqy.org | 14 +- taso.org | 8 +- 6 files changed, 293 insertions(+), 1105 deletions(-) diff --git a/eittlanda.org b/eittlanda.org index 9b0a247..f047166 100644 --- a/eittlanda.org +++ b/eittlanda.org @@ -432,9 +432,9 @@ relation des différentes voyelles entre elles. #+NAME: vow-dot - #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes + #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes <> - (defvar vowels + (defvar eittlandic-vowels '("vowels" ("[high]" ("[rnd]" @@ -454,18 +454,18 @@ ("[low]" ("/æ/")) ("{low}" ("/e/"))) ("{tense}" ("/ɑ/")))))) - (tree-to-dot vowels) + (tree-to-dot eittlandic-vowels) #+END_SRC - #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.svg :var input=vow-dot :exports results :cache yes + #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.svg :var input=vow-dot :exports results $input #+END_SRC #+NAME: arbre:vowels #+ATTR_HTML: :alt Arbre des voyelles de l’Eittlandais #+ATTR_LATEX: :float sideways #+CAPTION: Arbre des caractéristiques distinctives des voyelles de l’Eittlandais - #+RESULTS[13479f199983d5f36a4583e44b8842f03dd66807]: - [[file:img/eittlanda-vowel-feature-tree.png]] + #+RESULTS: + [[file:img/eittlanda/vowel-feature-tree.svg]] Dans le tableau [[table:vowels:features]] sont présentées chacune des caractéristiques de chaque voyelle individuelle de l’Eittlandais. diff --git a/img/eittlanda/vowel-feature-tree.svg b/img/eittlanda/vowel-feature-tree.svg index 4e5d134..1c82875 100644 --- a/img/eittlanda/vowel-feature-tree.svg +++ b/img/eittlanda/vowel-feature-tree.svg @@ -4,414 +4,294 @@ - + %3 0 -vowel +vowels 1 -[high] +[high] 0--1 - + - + 2 -{high} +{high} - + 0--2 - + 11 -[frnt] +[rnd] 1--11 - + - + 12 -{frnt} +{rnd} - + 1--12 - + 111 -[tense] +[front] 11--111 - + - + 112 -{tense} +{front} - + 11--112 - + 1111 -[rnd] +/y/ 111--1111 - - - - -1112 -{rnd} - - - -111--1112 - - - - -11111 -ʏ - - - -1111--11111 - - - - -11121 -ɪ - - - -1112--11121 - + - + 1121 -[rnd] +/u/ - + 112--1121 - - - - -1122 -{rnd} - - - -112--1122 - - - - -11211 -y - - - -1121--11211 - - - - -11221 -i - - - -1122--11221 - + - + 121 -[tense] +/i/ - + 12--121 - - - - -122 -{tense} - - - -12--122 - - - - -1211 -ɨ - - - -121--1211 - - - - -1221 -ʊ - - - -122--1221 - + - + 21 -[nas] +[rnd] - + 2--21 - + - + 22 -{nas} +{rnd} - + 2--22 - + - + 211 -[frnt] +[tense] - + 21--211 - + - + 212 -{frnt} +{tense} - + 21--212 - + - + 2111 -[tense] +[front] - + 211--2111 - + - + 2112 -{tense} +{front} - + 211--2112 - + - + 21111 -ø̃ +/ø/ - + 2111--21111 - + - + 21121 -ɛ̃ +/o/ - + 2112--21121 - + - + 2121 -[tense] +[front] - + 212--2121 - + - + 2122 -{tense} +{front} - + 212--2122 - + - + 21211 -ɤ̃ +/œ/ - + 2121--21211 - + - + 21221 -ɑ̃ +/ɔ/ - + 2122--21221 - + - + 221 -[frnt] +[tense] - + 22--221 - + - + 222 -{frnt} +{tense} - + 22--222 - + - + 2211 -[tense] +[low] - + 221--2211 - + - + 2212 -{tense} +{low} - + 221--2212 - + - + 22111 -ø +/æ/ - + 2211--22111 - + - + 22121 -ɛ +/e/ - + 2212--22121 - + - + 2221 -[tense] +/ɑ/ - + 222--2221 - - - - -2222 -{tense} - - - -222--2222 - - - - -22211 -ɤ - - - -2221--22211 - - - - -22221 -a - - - -2222--22221 - + diff --git a/img/nyqy/consonant-feature-tree.svg b/img/nyqy/consonant-feature-tree.svg index 7f811cb..c897113 100644 --- a/img/nyqy/consonant-feature-tree.svg +++ b/img/nyqy/consonant-feature-tree.svg @@ -4,744 +4,234 @@ - - + + %3 0 -consonant +[cons] 1 -[son] +[son] 0--1 - + - + 2 -{son} +{son} - + 0--2 - + 11 -[cor] +[dor] 1--11 - + - + 12 -{cor} +{dor} - + 1--12 - + 111 -[cont] +[high] 11--111 - + - + 112 -{cont} +{high} - -11--112 - - - - -1111 -[SG] - - -111--1111 - - - - -1112 -{SG} - - - -111--1112 - - - - -11111 -ɬ - - - -1111--11111 - - - - -11121 -l - - - -1112--11121 - - - - -1121 -n - - - -112--1121 - +11--112 + - + 121 -[cont] +[cor] - + 12--121 - + - + 122 -{cont} +{cor} - + 12--122 - - - - -1211 -[SG] - - - -121--1211 - - - - -1212 -{SG} - - - -121--1212 - - - - -12111 -ʍ - - - -1211--12111 - - - - -12121 -w - - - -1212--12121 - - - - -1221 -m - - - -122--1221 - + - + 21 -[cor] +[dor] - + 2--21 - + - + 22 -{cor} +{dor} - + 2--22 - + - + 211 -[dor] +[voice] - + 21--211 - + - + 212 -{dor} +{voice} - + 21--212 - + - + 2111 -[cont] +[high] - + 211--2111 - + - + 2112 -{cont} +{high} - + 211--2112 - - - - -21111 -[voice] - - - -2111--21111 - - - - -21112 -{voice} - - - -2111--21112 - - - - -211111 -ʝ - - - -21111--211111 - - - - -211121 -ç - - - -21112--211121 - - - - -21121 -[SG] - - - -2112--21121 - - - - -21122 -{SG} - - - -2112--21122 - - - - -211211 -[voice] - - - -21121--211211 - - - - -211212 -{voice} - - - -21121--211212 - - - - -2112111 -d͡ʒʰ - - - -211211--2112111 - - - - -2112121 -t͡ʃʰ - - - -211212--2112121 - - - - -211221 -[voice] - - - -21122--211221 - - - - -211222 -{voice} - - - -21122--211222 - - - - -2112211 -d͡ʒ - - - -211221--2112211 - - - - -2112221 -t͡ʃ - - - -211222--2112221 - + - + 2121 -[cont] +[high] - + 212--2121 - + - + 2122 -{cont} +{high} - + 212--2122 - - - - -21211 -[voice] - - - -2121--21211 - - - - -21212 -{voice} - - - -2121--21212 - - - - -212111 -z - - - -21211--212111 - - - - -212121 -s - - - -21212--212121 - - - - -21221 -[SG] - - - -2122--21221 - - - - -21222 -{SG} - - - -2122--21222 - - - - -212211 -[voice] - - - -21221--212211 - - - - -212212 -{voice} - - - -21221--212212 - - - - -2122111 -dʰ - - - -212211--2122111 - - - - -2122121 -tʰ - - - -212212--2122121 - - - - -212221 -[voice] - - - -21222--212221 - - - - -212222 -{voice} - - - -21222--212222 - - - - -2122211 -d - - - -212221--2122211 - - - - -2122221 -t - - - -212222--2122221 - + - + 221 -[dor] +[voice] - + 22--221 - + - + 222 -{dor} +{voice} - + 22--222 - + - + 2211 -[cont] +[cor] - + 221--2211 - + - + 2212 -{cont} +{cor} - + 221--2212 - - - - -22111 -[voice] - - - -2211--22111 - - - - -22112 -{voice} - - - -2211--22112 - - - - -221111 -ɣ - - - -22111--221111 - - - - -221121 -x - - - -22112--221121 - - - - -22121 -[voice] - - - -2212--22121 - - - - -22122 -{voice} - - - -2212--22122 - - - - -221211 -g - - - -22121--221211 - - - - -221221 -k - - - -22122--221221 - + - + 2221 -[cont] +[cor] - + 222--2221 - + - + 2222 -{cont} +{cor} - + 222--2222 - - - - -22211 -ɸ - - - -2221--22211 - - - - -22221 -[voice] - - - -2222--22221 - - - - -22222 -{voice} - - - -2222--22222 - - - - -222211 -b - - - -22221--222211 - - - - -222221 -p - - - -22222--222221 - + diff --git a/img/nyqy/vowel-feature-tree.svg b/img/nyqy/vowel-feature-tree.svg index 4e5d134..88c0632 100644 --- a/img/nyqy/vowel-feature-tree.svg +++ b/img/nyqy/vowel-feature-tree.svg @@ -4,414 +4,234 @@ - - + + %3 0 -vowel +[vowel] 1 -[high] +[back] 0--1 - + - + 2 -{high} +{back} - + 0--2 - + 11 -[frnt] +[tense] 1--11 - + - + 12 -{frnt} +{tense} - + 1--12 - + 111 -[tense] +[high] 11--111 - + - + 112 -{tense} +{high} - + 11--112 - + 1111 -[rnd] +ü 111--1111 - - - - -1112 -{rnd} - - - -111--1112 - - - - -11111 -ʏ - - - -1111--11111 - - - - -11121 -ɪ - - - -1112--11121 - + - + 1121 -[rnd] +ö - + 112--1121 - - - - -1122 -{rnd} - - - -112--1122 - - - - -11211 -y - - - -1121--11211 - - - - -11221 -i - - - -1122--11221 - + - + 121 -[tense] +[high] - + 12--121 - + - + 122 -{tense} +{high} - + 12--122 - + - + 1211 -ɨ +u - + 121--1211 - + - + 1221 -ʊ +o - + 122--1221 - + - + 21 -[nas] +[tense] - + 2--21 - + - + 22 -{nas} +{tense} - + 2--22 - + - + 211 -[frnt] +[high] - + 21--211 - + - + 212 -{frnt} +{high} - + 21--212 - + - + 2111 -[tense] +y - + 211--2111 - - - - -2112 -{tense} - - - -211--2112 - - - - -21111 -ø̃ - - - -2111--21111 - - - - -21121 -ɛ̃ - - - -2112--21121 - + - + 2121 -[tense] +ë - + 212--2121 - - - - -2122 -{tense} - - - -212--2122 - - - - -21211 -ɤ̃ - - - -2121--21211 - - - - -21221 -ɑ̃ - - - -2122--21221 - + - + 221 -[frnt] +[high] - + 22--221 - + - + 222 -{frnt} +{high} - + 22--222 - + - + 2211 -[tense] +i - + 221--2211 - - - - -2212 -{tense} - - - -221--2212 - - - - -22111 -ø - - - -2211--22111 - - - - -22121 -ɛ - - - -2212--22121 - + - + 2221 -[tense] +e - + 222--2221 - - - - -2222 -{tense} - - - -222--2222 - - - - -22211 -ɤ - - - -2221--22211 - - - - -22221 -a - - - -2222--22221 - + diff --git a/nyqy.org b/nyqy.org index 7420c01..dcff117 100644 --- a/nyqy.org +++ b/nyqy.org @@ -189,7 +189,7 @@ #+NAME: cons-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes <> - (defvar consonants + (defvar nyqy-consonants '("[cons]" ("[son]" ("[dor]" @@ -213,11 +213,9 @@ ("{voice}" ("[cor]") ("{cor}")))))) - (tree-to-dot consonants) + (tree-to-dot nyqy-consonants) #+END_SRC - #+RESULTS[3cdf83976255f554cbde3c9c60d3c98fe3ff6f7c]: cons-tree - #+BEGIN_SRC dot :file img/nyqy/consonant-feature-tree.svg :var input=cons-tree :exports results :eval yes :cache yes $input #+END_SRC @@ -311,7 +309,7 @@ #+NAME: vow-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes <> - (defvar vowels + (defvar nyqy-vowels '("[vowel]" ("[back]" ("[tense]" @@ -327,7 +325,7 @@ ("{tense}" ("[high]" ("i")) ("{high}" ("e")))))) - (tree-to-dot vowels) + (tree-to-dot nyqy-vowels) #+END_SRC #+BEGIN_SRC dot :file img/nyqy/vowel-feature-tree.svg :var input=vow-tree :exports results :eval yes :cache yes @@ -707,7 +705,7 @@ #+NAME: basic-syntax-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes <> - (defvar syntax-tree + (defvar nyqy-syntax-tree '("S" ("Obl") ("S'" @@ -728,7 +726,7 @@ ("Tense") ("V") ("Neg"))))))) - (tree-to-dot syntax-tree) + (tree-to-dot nyqy-syntax-tree) #+END_SRC #+BEGIN_SRC dot :file img/nyqy/basic-syntax.svg :var input=basic-syntax-tree :exports results :eval yes :cache yes diff --git a/taso.org b/taso.org index 8f2e430..9841278 100644 --- a/taso.org +++ b/taso.org @@ -73,7 +73,7 @@ #+name: cons-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes <> - (defvar consonants + (defvar taso-consonants '("consonant" ("[son]" ("[cor]" @@ -123,7 +123,7 @@ ("{cont}" ("[voice]" ("b")) ("{voice}" ("p")))))))) - (tree-to-dot consonants) + (tree-to-dot taso-consonants) #+END_SRC #+BEGIN_SRC dot :file img/taso/consonant-feature-tree.svg :var input=cons-tree :exports results :eval yes :cache yes @@ -156,7 +156,7 @@ #+name: vowel-tree #+BEGIN_SRC emacs-lisp :noweb yes :exports none :eval yes :cache yes <> - (defvar vowels + (defvar taso-vowels '("vowel" ("[high]" ("[frnt]" @@ -184,7 +184,7 @@ ("{frnt}" ("[tense]" ("ɤ")) ("{tense}" ("a"))))))) - (tree-to-dot vowels) + (tree-to-dot taso-vowels) #+END_SRC #+BEGIN_SRC dot :file img/taso/vowel-feature-tree.svg :var input=vowel-tree :exports results :eval yes :cache yes