signoj en <pr>

revuloj · Jun 8, 2024 · 9c41ea5 · 9c41ea5
1 parent 291ae71
commit 9c41ea5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 44 deletions.
diff --git a/dtd/vokoxml.rnc b/dtd/vokoxml.rnc
@@ -418,9 +418,9 @@ marko = xsd:ID { pattern = "([a-z0-9_]+)\.[A-Za-z0-9\._]+" }
 
 ## [_prononco_]
 ## La pronco povas esti donita aŭ per latinaj literoj (kun supersignoj)
-## per hiragano aŭ bopomofo
+## per hiragano, katakano aŭ bopomofo kaj kelkaj apartaj signoj
 
-prononco = xsd:string { pattern = "[\p{IsBasicLatin}\p{IsLatin-1Supplement}\p{IsLatinExtended-A}\p{IsLatinExtended-B}]+|\p{IsBopomofo}+|[\p{IsHiragana}\p{IsKatakana}]+" }
+prononco = xsd:string { pattern = "[\p{IsBasicLatin}\p{IsLatin-1Supplement}\p{IsLatinExtended-A}\p{IsLatinExtended-B}]+|\p{IsBopomofo}+|[\s\p{IsHiragana}\p{IsKatakana}\p{IsHalfwidthandFullwidthForms}]+" }
 
 
 ## [kap]

diff --git a/perl/replace_in_art.pl b/perl/replace_in_art.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# (c) 2022-2023 Wolfram Diestel
+# (c) 2022-2024 Wolfram Diestel
 # laŭ GPL 2.0
 #
 # faras anstataŭigojn en artikoloj kaj altigas la versi-numeron en Id...
@@ -66,47 +66,47 @@ sub process_art {
 #    $chg += ($xml =~ s|<pr>(.*?)(?:&#x163B;)(.*?)</pr>|<pr>$1ū$2</pr>|g); # ᘻ
 #    $chg += ($xml =~ s|<pr>(.*?)(?:&#x161D;)(.*?)</pr>|<pr>$1ō$2</pr>|g); # ᘝ
 
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15D1;|&#5585;)(.*?)</pr>,<pr>$1&#257;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15E3;|&#5603;)(.*?)</pr>,<pr>$1&#275;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15F3;|&#5619;)(.*?)</pr>,<pr>$1&#291;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15FB;|&#5627;)(.*?)</pr>,<pr>$1&#299;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1607;|&#5639;)(.*?)</pr>,<pr>$1&#311;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x160C;|&#5644;)(.*?)</pr>,<pr>$1&#316;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1616;|&#5654;)(.*?)</pr>,<pr>$1&#326;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x161D;|&#5661;)(.*?)</pr>,<pr>$1&#333;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1627;|&#5671;)(.*?)</pr>,<pr>$1&#343;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x163B;|&#5691;)(.*?)</pr>,<pr>$1&#363;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15D0;|&#5584;)(.*?)</pr>,<pr>$1&#256;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15E2;|&#5602;)(.*?)</pr>,<pr>$1&#274;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15F2;|&#5618;)(.*?)</pr>,<pr>$1&#290;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15FA;|&#5626;)(.*?)</pr>,<pr>$1&#298;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1606;|&#5638;)(.*?)</pr>,<pr>$1&#310;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x160B;|&#5643;)(.*?)</pr>,<pr>$1&#315;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1615;|&#5653;)(.*?)</pr>,<pr>$1&#325;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x161C;|&#5660;)(.*?)</pr>,<pr>$1&#332;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1626;|&#5670;)(.*?)</pr>,<pr>$1&#342;$2</pr>,g);
-    $chg += ($xml =~ s,<pr>(.*?)(?:&#x163A;|&#5690;)(.*?)</pr>,<pr>$1&#362;$2</pr>,g);
-
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15D1;|&#5585;)(.*?)</trd>,<trd lng="lv">$1&#257;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15E3;|&#5603;)(.*?)</trd>,<trd lng="lv">$1&#275;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15F3;|&#5619;)(.*?)</trd>,<trd lng="lv">$1&#291;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15FB;|&#5627;)(.*?)</trd>,<trd lng="lv">$1&#299;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1607;|&#5639;)(.*?)</trd>,<trd lng="lv">$1&#311;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x160C;|&#5644;)(.*?)</trd>,<trd lng="lv">$1&#316;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1616;|&#5654;)(.*?)</trd>,<trd lng="lv">$1&#326;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x161D;|&#5661;)(.*?)</trd>,<trd lng="lv">$1&#333;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1627;|&#5671;)(.*?)</trd>,<trd lng="lv">$1&#343;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x163B;|&#5691;)(.*?)</trd>,<trd lng="lv">$1&#363;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15D0;|&#5584;)(.*?)</trd>,<trd lng="lv">$1&#256;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15E2;|&#5602;)(.*?)</trd>,<trd lng="lv">$1&#274;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15F2;|&#5618;)(.*?)</trd>,<trd lng="lv">$1&#290;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x15FA;|&#5626;)(.*?)</trd>,<trd lng="lv">$1&#298;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1606;|&#5638;)(.*?)</trd>,<trd lng="lv">$1&#310;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x160B;|&#5643;)(.*?)</trd>,<trd lng="lv">$1&#315;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1615;|&#5653;)(.*?)</trd>,<trd lng="lv">$1&#325;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x161C;|&#5660;)(.*?)</trd>,<trd lng="lv">$1&#332;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x1626;|&#5670;)(.*?)</trd>,<trd lng="lv">$1&#342;$2</trd>,g);
-    $chg += ($xml =~ s,<trd lng="lv">(.*?)(?:&#x163A;|&#5690;)(.*?)</trd>,<trd lng="lv">$1&#362;$2</trd>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15D1;|&#5585;)(.*?)</pr>,<pr>$1&#257;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15E3;|&#5603;)(.*?)</pr>,<pr>$1&#275;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15F3;|&#5619;)(.*?)</pr>,<pr>$1&#291;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15FB;|&#5627;)(.*?)</pr>,<pr>$1&#299;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1607;|&#5639;)(.*?)</pr>,<pr>$1&#311;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x160C;|&#5644;)(.*?)</pr>,<pr>$1&#316;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1616;|&#5654;)(.*?)</pr>,<pr>$1&#326;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x161D;|&#5661;)(.*?)</pr>,<pr>$1&#333;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1627;|&#5671;)(.*?)</pr>,<pr>$1&#343;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x163B;|&#5691;)(.*?)</pr>,<pr>$1&#363;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15D0;|&#5584;)(.*?)</pr>,<pr>$1&#256;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15E2;|&#5602;)(.*?)</pr>,<pr>$1&#274;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15F2;|&#5618;)(.*?)</pr>,<pr>$1&#290;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x15FA;|&#5626;)(.*?)</pr>,<pr>$1&#298;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1606;|&#5638;)(.*?)</pr>,<pr>$1&#310;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x160B;|&#5643;)(.*?)</pr>,<pr>$1&#315;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1615;|&#5653;)(.*?)</pr>,<pr>$1&#325;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x161C;|&#5660;)(.*?)</pr>,<pr>$1&#332;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x1626;|&#5670;)(.*?)</pr>,<pr>$1&#342;$2</pr>,g);
+#    $chg += ($xml =~ s,<pr>(.*?)(?:&#x163A;|&#5690;)(.*?)</pr>,<pr>$1&#362;$2</pr>,g);
+
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15D1;|&#5585;)(.*?)</trd>,<trd lng="$1">$2&#257;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15E3;|&#5603;)(.*?)</trd>,<trd lng="$1">$2&#275;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15F3;|&#5619;)(.*?)</trd>,<trd lng="$1">$2&#291;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15FB;|&#5627;)(.*?)</trd>,<trd lng="$1">$2&#299;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1607;|&#5639;)(.*?)</trd>,<trd lng="$1">$2&#311;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x160C;|&#5644;)(.*?)</trd>,<trd lng="$1">$2&#316;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1616;|&#5654;)(.*?)</trd>,<trd lng="$1">$2&#326;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x161D;|&#5661;)(.*?)</trd>,<trd lng="$1">$2&#333;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1627;|&#5671;)(.*?)</trd>,<trd lng="$1">$2&#343;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x163B;|&#5691;)(.*?)</trd>,<trd lng="$1">$2&#363;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15D0;|&#5584;)(.*?)</trd>,<trd lng="$1">$2&#256;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15E2;|&#5602;)(.*?)</trd>,<trd lng="$1">$2&#274;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15F2;|&#5618;)(.*?)</trd>,<trd lng="$1">$2&#290;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x15FA;|&#5626;)(.*?)</trd>,<trd lng="$1">$2&#298;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1606;|&#5638;)(.*?)</trd>,<trd lng="$1">$2&#310;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x160B;|&#5643;)(.*?)</trd>,<trd lng="$1">$2&#315;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1615;|&#5653;)(.*?)</trd>,<trd lng="$1">$2&#325;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x161C;|&#5660;)(.*?)</trd>,<trd lng="$1">$2&#332;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x1626;|&#5670;)(.*?)</trd>,<trd lng="$1">$2&#342;$3</trd>,g);
+    $chg += ($xml =~ s,<trd lng="(lv|mi|sm|na|ha|lt)">(.*?)(?:&#x163A;|&#5690;)(.*?)</trd>,<trd lng="$1">$2&#362;$3</trd>,g);
 
 # ĝustaj
 # "amacron":"ā",