diff --git a/Basilisk/MACAO/macao_12/contenu/pages/pgd171.html b/Basilisk/MACAO/macao_12/contenu/pages/pgd171.html
index 49c102abe92b536bf564cfc979ec28b52ddfc7d4..b118b1d7603838aec4a9b877f21a11663c71cff7 100755
--- a/Basilisk/MACAO/macao_12/contenu/pages/pgd171.html
+++ b/Basilisk/MACAO/macao_12/contenu/pages/pgd171.html
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
-<head><title>phonème</title>
+<head><title>Phon�me</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="generator" content="MindOnSite - www.mindonsite.com">
<meta http-equiv="imagetoolbar" content="no">
@@ -36,9 +36,9 @@
</div>
</a></div>
<div id="STY_zoneTitreDoc" class="STY_zoneTitreDoc" style="">
- <div id="STY_titreDoc" class="STY_titreDoc" style=" ">phonème</div>
+ <div id="STY_titreDoc" class="STY_titreDoc" style=" ">phon�me</div>
<div id="STY_sousTitreDoc" class="STY_sousTitreDoc" style=" "></div>
</div>
-<div id="STY_texteDoc" class="STY_texteDoc" style=" ">Un phonème est une unité minimale de l'oral.</div>
+<div id="STY_texteDoc" class="STY_texteDoc" style=" ">Un phon�me est une unit� minimale de l'oral.</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tetras_extraction/schemes/macao-manual-edition.ttl b/tetras_extraction/schemes/macao-manual-edition.ttl
index 4659e2d024d215d7c38e4513dc1af914b309b906..53ee78811fe5d655f188813cda4b32597d3d2402 100644
--- a/tetras_extraction/schemes/macao-manual-edition.ttl
+++ b/tetras_extraction/schemes/macao-manual-edition.ttl
@@ -152,28 +152,104 @@ macao:pg359_3
rdfs:subClassOf macao:pg359 ;
.
macao:pg376
- macao:description_md_manual_edition """Ecoutez et répétez chacun des mots.
-
-Chaque mot ne comporte qu'une syllabe. Pour écouter, cliquez sur la flèche.
-
-| | |
-| --- | ----------- |
-| {{< audio id=\"i1\" src=\"media/i1/i1_01.mp3\" class=\"something\" >}} | I |
-| {{< audio id=\"stopped1\" src=\"media/stopped1/stopped1_01.mp3\" class=\"something\" >}} | stopped |
-| {{< audio id=\"eye1\" src=\"media/eye1/eye1_01.mp3\" class=\"something\" >}} | eye |
-| {{< audio id=\"brought1\" src=\"media/brought1/brought1_01.mp3\" class=\"something\" >}} | brought |
-| {{< audio id=\"cry1\" src=\"media/cry1/cry1_01.mp3\" class=\"something\" >}} | cry |
-| {{< audio id=\"marked1\" src=\"media/marked1/marked1_01.mp3\" class=\"something\" >}} | marked |
-| {{< audio id=\"head1\" src=\"media/head1/head1_01.mp3\" class=\"something\" >}} | head |
-| {{< audio id=\"horse1\" src=\"media/horse1/horse1_01.mp3\" class=\"something\" >}} | horse | |
-| {{< audio id=\"spring1\" src=\"media/spring1/spring1_01.mp3\" class=\"something\" >}} | spring |
-| {{< audio id=\"some1\" src=\"media/some1/some1_01.mp3\" class=\"something\" >}} | some | |
-| {{< audio id=\"talked1\" src=\"media/talked1/talked1_01.mp3\" class=\"something\" >}} | talked |
-| {{< audio id=\"buy1\" src=\"media/buy1/buy1_01.mp3\" class=\"something\" >}} | buy | |
-| {{< audio id=\"months1\" src=\"media/months1/months1_01.mp3\" class=\"something\" >}} | months |
-| {{< audio id=\"by1\" src=\"media/by1/by1_01.mp3\" class=\"something\" >}} | by | |
-| {{< audio id=\"blurred1\" src=\"media/blurred1/blurred1_01.mp3\" class=\"something\" >}} | blurred |
-| {{< audio id=\"son_a2\" src=\"media/son_a2/son_a2_01.mp3\" class=\"something\" >}} | a | """ ;
+ macao:description_md_manual_edition """<div id=\"STY_texteCours\" class=\"STY_texteCours\" style=\" \"><p align=\"\"><br><font color=\"#a60a69\">Ecoutez et répétez
+ chacun des mots suivants. <br>Chaque mot ne comporte qu'une </font><font color=\"#a60a69\"><a class=\"STY_lienComt\" href=\"javascript:CRS_afficherDetail('1')\" onclick=\"enrPosClic(event,'1')\">syllabe</a></font><font color=\"#a60a69\">. Pour écouter, cliquez sur la flèche. <br>Pour vous enregistrer et interrompre
+ l'enregistrement, cliquez sur le bouton rouge.<br>Pour vous réécouter, cliquez sur la flèche.</font><br></p>
+ <p align=\"\">
+ </p><table class=\"STY_tableau\" width=\"500\" cellpadding=\"3\" cellspacing=\"0\" valign=\"top\" border=\"0\">
+ <tr>
+ <td width=\"65\" valign=\"top\"></td>
+ <td valign=\"top\"><p align=\"\">
+ </p><table class=\"STY_tableau\" width=\"400\" cellpadding=\"3\" cellspacing=\"0\" valign=\"top\" border=\"0\">
+ <tr>
+ <td width=\"30\" valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV46', 'i1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ <br></td>
+ <td width=\"150\" valign=\"top\">I<br><br></td>
+ <td width=\"30\" valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV52', 'stopped1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">stopped</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV51', 'eye1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ <br></td>
+ <td valign=\"top\"><p align=\"\">eye<br><br></p></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV72', 'brought1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">brought</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV93', 'cry1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\"><p align=\"\">cry<br><br></p></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV55', 'marked1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">marked</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <p align=\"\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV41', 'head1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ <br></p>
+ </td>
+ <td valign=\"top\"><p align=\"\">head<br><br></p></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV70', 'horse1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">horse</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV7', 'spring1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">spring<br><br></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV88', 'some1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">some</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV98', 'talked1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">talked<br><br></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV30', 'buy1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">buy</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV67', 'months1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ <br></td>
+ <td valign=\"top\">months<br><br></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV17', 'by1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">by</td>
+ </tr>
+ <tr>
+ <td valign=\"top\">
+ <p align=\"\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV49', 'blurred1.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </p>
+ </td>
+ <td valign=\"top\"><p align=\"\">blurred</p></td>
+ <td valign=\"top\">
+ <script type=\"text/javascript\">ajDocW(PF_clipAV('clipAV12', 'son_a2.swf', '18', '18', 'false', 'Flash', 'false', '', 'Quality:high;wmode:transparent', ''));</script>
+ </td>
+ <td valign=\"top\">a</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </div>""" ;
.
macao:pg379
rdf:type macao-manual-edition:ExerciceQC_manualEdit ;
diff --git a/tetras_extraction/script/src/transform.py b/tetras_extraction/script/src/transform.py
index b42ce1774611af7e1218605ae3aa7acdcd0c0d3c..e50e2dde62cb52a6d47c5e7881819448c6593262 100644
--- a/tetras_extraction/script/src/transform.py
+++ b/tetras_extraction/script/src/transform.py
@@ -63,7 +63,8 @@ def prepareHTMLforMD(str):
# Identify anchor words that support Doc
regexANCHOR2= re.compile(r"<a.*?ouvrirDoc\('(.*?)','(.*?)'\)\">(.*?\n?.*?)</a>", re.MULTILINE)
str = regexANCHOR2.sub(r"@ANCHORSTART@commentfile_\1.\2@\3@ANCHOREND", str)
- str = str.replace(r"\_","_")
+ str = re.sub(r'@(.*)\n(.*)@ANCHOREND', r"@\1 \2@ANCHOREND", str)
+ str = str.replace(r"\_","_").replace("PAGE","html")
return(str)
@@ -110,7 +111,7 @@ def postEditMD(str1):
str1 = str1.replace(match,str(i))
except FileNotFoundError:
pass
- #print(f"File {filepath} not found.")
+ print(f"File {filepath} not found.")
# First for the words supporting the comments
regexANCHOR = re.compile(r"@ANCHORSTART@(.*?)@(.*?)@ANCHOREND")