ether-code 0.6.1 → 0.6.3

package/i18n/i18n-html.json

@@ -2406,5 +2406,404 @@
         "nouvelleFenetreNat": { "fr": "nouvelle fenêtre", "en": "new window", "es": "nueva ventana", "ru": "новое окно", "zh": "新窗口", "ja": "新しいウィンドウ" },
         "champTexte": { "fr": "champ texte", "en": "text field", "es": "campo texto", "ru": "текстовое поле", "zh": "文本字段", "ja": "テキストフィールド" },
         "page": { "fr": "page", "en": "page", "es": "página", "ru": "страница", "zh": "页面", "ja": "ページ" }
+    },
+    "metaAttributes": {
+    "charset": {
+      "fr": "jeu caractères",
+      "en": "charset",
+      "es": "juego caracteres",
+      "ru": "кодировка",
+      "zh": "字符集",
+      "ja": "文字セット",
+      "html": "charset"
+    },
+    "contenu": {
+      "fr": "contenu",
+      "en": "content",
+      "es": "contenido",
+      "ru": "содержимое",
+      "zh": "内容",
+      "ja": "コンテンツ",
+      "html": "content"
+    },
+    "httpEquiv": {
+      "fr": "équivalent http",
+      "en": "http-equiv",
+      "es": "equivalente http",
+      "ru": "http-equiv",
+      "zh": "http等效",
+      "ja": "http-equiv",
+      "html": "http-equiv"
+    },
+    "nomMeta": {
+      "fr": "nom",
+      "en": "name",
+      "es": "nombre",
+      "ru": "имя",
+      "zh": "名称",
+      "ja": "名前",
+      "html": "name"
+    }
+  },
+  "scriptAttributes": {
+    "differe": {
+      "fr": "différé",
+      "en": "defer",
+      "es": "diferido",
+      "ru": "отложенный",
+      "zh": "延迟",
+      "ja": "遅延",
+      "html": "defer"
+    },
+    "asynchrone": {
+      "fr": "asynchrone",
+      "en": "async",
+      "es": "asíncrono",
+      "ru": "асинхронный",
+      "zh": "异步",
+      "ja": "非同期",
+      "html": "async"
+    },
+    "srcScript": {
+      "fr": "source",
+      "en": "src",
+      "es": "fuente",
+      "ru": "источник",
+      "zh": "源",
+      "ja": "ソース",
+      "html": "src"
+    },
+    "typeScript": {
+      "fr": "type",
+      "en": "type",
+      "es": "tipo",
+      "ru": "тип",
+      "zh": "类型",
+      "ja": "タイプ",
+      "html": "type"
+    },
+    "module": {
+      "fr": "module",
+      "en": "module",
+      "es": "módulo",
+      "ru": "модуль",
+      "zh": "模块",
+      "ja": "モジュール",
+      "html": "module"
+    },
+    "nomodule": {
+      "fr": "sans module",
+      "en": "nomodule",
+      "es": "sin módulo",
+      "ru": "без модуля",
+      "zh": "无模块",
+      "ja": "モジュールなし",
+      "html": "nomodule"
+    },
+    "integrite": {
+      "fr": "intégrité",
+      "en": "integrity",
+      "es": "integridad",
+      "ru": "целостность",
+      "zh": "完整性",
+      "ja": "整合性",
+      "html": "integrity"
+    },
+    "crossorigin": {
+      "fr": "origine croisée",
+      "en": "crossorigin",
+      "es": "origen cruzado",
+      "ru": "кросс-домен",
+      "zh": "跨域",
+      "ja": "クロスオリジン",
+      "html": "crossorigin"
+    }
+  },
+  "tableAttributes": {
+    "portee": {
+      "fr": "portée",
+      "en": "scope",
+      "es": "ámbito",
+      "ru": "область",
+      "zh": "范围",
+      "ja": "スコープ",
+      "html": "scope"
+    },
+    "porteeCol": {
+      "fr": "col",
+      "en": "col",
+      "es": "col",
+      "ru": "col",
+      "zh": "col",
+      "ja": "col",
+      "html": "col"
+    },
+    "porteeRow": {
+      "fr": "ligne",
+      "en": "row",
+      "es": "fila",
+      "ru": "строка",
+      "zh": "行",
+      "ja": "行",
+      "html": "row"
+    },
+    "porteeColgroup": {
+      "fr": "groupe colonnes",
+      "en": "colgroup",
+      "es": "grupo columnas",
+      "ru": "группа колонок",
+      "zh": "列组",
+      "ja": "列グループ",
+      "html": "colgroup"
+    },
+    "porteeRowgroup": {
+      "fr": "groupe lignes",
+      "en": "rowgroup",
+      "es": "grupo filas",
+      "ru": "группа строк",
+      "zh": "行组",
+      "ja": "行グループ",
+      "html": "rowgroup"
+    },
+    "fusionColonnes": {
+      "fr": "fusion colonnes",
+      "en": "colspan",
+      "es": "fusión columnas",
+      "ru": "объединение колонок",
+      "zh": "跨列",
+      "ja": "列の結合",
+      "html": "colspan"
+    },
+    "fusionLignes": {
+      "fr": "fusion lignes",
+      "en": "rowspan",
+      "es": "fusión filas",
+      "ru": "объединение строк",
+      "zh": "跨行",
+      "ja": "行の結合",
+      "html": "rowspan"
+    },
+    "etendueCol": {
+      "fr": "étendue",
+      "en": "span",
+      "es": "extensión",
+      "ru": "охват",
+      "zh": "跨度",
+      "ja": "スパン",
+      "html": "span"
+    },
+    "headers": {
+      "fr": "entêtes",
+      "en": "headers",
+      "es": "encabezados",
+      "ru": "заголовки",
+      "zh": "标题",
+      "ja": "ヘッダー",
+      "html": "headers"
+    }
+  },
+  "iframeAttributes": {
+    "srcIframe": {
+      "fr": "source",
+      "en": "src",
+      "es": "fuente",
+      "ru": "источник",
+      "zh": "源",
+      "ja": "ソース",
+      "html": "src"
+    },
+    "allow": {
+      "fr": "autoriser",
+      "en": "allow",
+      "es": "permitir",
+      "ru": "разрешить",
+      "zh": "允许",
+      "ja": "許可",
+      "html": "allow"
+    },
+    "allowfullscreen": {
+      "fr": "plein écran",
+      "en": "allowfullscreen",
+      "es": "pantalla completa",
+      "ru": "полный экран",
+      "zh": "全屏",
+      "ja": "フルスクリーン",
+      "html": "allowfullscreen"
+    },
+    "sandbox": {
+      "fr": "bac à sable",
+      "en": "sandbox",
+      "es": "sandbox",
+      "ru": "песочница",
+      "zh": "沙盒",
+      "ja": "サンドボックス",
+      "html": "sandbox"
+    },
+    "loading": {
+      "fr": "chargement",
+      "en": "loading",
+      "es": "carga",
+      "ru": "загрузка",
+      "zh": "加载",
+      "ja": "ロード",
+      "html": "loading"
+    },
+    "name": {
+      "fr": "nom",
+      "en": "name",
+      "es": "nombre",
+      "ru": "имя",
+      "zh": "名称",
+      "ja": "名前",
+      "html": "name"
+    },
+    "referrerpolicy": {
+      "fr": "politique référent",
+      "en": "referrerpolicy",
+      "es": "política referente",
+      "ru": "политика реферера",
+      "zh": "引荐策略",
+      "ja": "リファラーポリシー",
+      "html": "referrerpolicy"
+    },
+    "srcdoc": {
+      "fr": "document source",
+      "en": "srcdoc",
+      "es": "documento fuente",
+      "ru": "исходный документ",
+      "zh": "源文档",
+      "ja": "ソースドキュメント",
+      "html": "srcdoc"
+    }
+  },
+  "objectAttributes": {
+    "donneesObjet": {
+      "fr": "données",
+      "en": "data",
+      "es": "datos",
+      "ru": "данные",
+      "zh": "数据",
+      "ja": "データ",
+      "html": "data"
+    },
+    "typeObjet": {
+      "fr": "type",
+      "en": "type",
+      "es": "tipo",
+      "ru": "тип",
+      "zh": "类型",
+      "ja": "タイプ",
+      "html": "type"
+    },
+    "nomObjet": {
+      "fr": "nom",
+      "en": "name",
+      "es": "nombre",
+      "ru": "имя",
+      "zh": "名称",
+      "ja": "名前",
+      "html": "name"
+    },
+    "usemap": {
+      "fr": "carte",
+      "en": "usemap",
+      "es": "mapa",
+      "ru": "карта",
+      "zh": "地图",
+      "ja": "マップ",
+      "html": "usemap"
+    },
+    "form": {
+      "fr": "formulaire",
+      "en": "form",
+      "es": "formulario",
+      "ru": "форма",
+      "zh": "表单",
+      "ja": "フォーム",
+      "html": "form"
+    }
+  },
+  "areaAttributes": {
+    "forme": {
+      "fr": "forme",
+      "en": "shape",
+      "es": "forma",
+      "ru": "форма",
+      "zh": "形状",
+      "ja": "形状",
+      "html": "shape"
+    },
+    "rect": {
+      "fr": "rectangle",
+      "en": "rect",
+      "es": "rectángulo",
+      "ru": "прямоугольник",
+      "zh": "矩形",
+      "ja": "長方形",
+      "html": "rect"
+    },
+    "circle": {
+      "fr": "cercle",
+      "en": "circle",
+      "es": "círculo",
+      "ru": "круг",
+      "zh": "圆形",
+      "ja": "円",
+      "html": "circle"
+    },
+    "poly": {
+      "fr": "polygone",
+      "en": "poly",
+      "es": "polígono",
+      "ru": "многоугольник",
+      "zh": "多边形",
+      "ja": "ポリゴン",
+      "html": "poly"
+    },
+    "coordonnees": {
+      "fr": "coordonnées",
+      "en": "coords",
+      "es": "coordenadas",
+      "ru": "координаты",
+      "zh": "坐标",
+      "ja": "座標",
+      "html": "coords"
+    },
+    "alternativeArea": {
+      "fr": "alternative",
+      "en": "alt",
+      "es": "alternativo",
+      "ru": "альтернатива",
+      "zh": "替代文本",
+      "ja": "代替テキスト",
+      "html": "alt"
+    },
+    "hrefArea": {
+      "fr": "adresse",
+      "en": "href",
+      "es": "enlace",
+      "ru": "ссылка",
+      "zh": "链接",
+      "ja": "リンク",
+      "html": "href"
+    },
+    "targetArea": {
+      "fr": "cible",
+      "en": "target",
+      "es": "destino",
+      "ru": "цель",
+      "zh": "目标",
+      "ja": "ターゲット",
+      "html": "target"
+    },
+    "downloadArea": {
+      "fr": "téléchargement",
+      "en": "download",
+      "es": "descargar",
+      "ru": "скачать",
+      "zh": "下载",
+      "ja": "ダウンロード",
+      "html": "download"
     }
+  }
 }

package/lexer/ether-lexer.js

@@ -75,6 +75,7 @@ const TokenType = {
   
   COMMENT: 'COMMENT',
   BLOCK_COMMENT: 'BLOCK_COMMENT',
+  SEMICOLON: 'SEMICOLON',
   
   EOF: 'EOF',
   ERROR: 'ERROR'
@@ -306,7 +307,7 @@ class EtherLexer {
         this.tokens.push(new Token(TokenType.DEDENT, '', this.line, 1, indent))
       }
       if (this.indentStack[this.indentStack.length - 1] !== indent) {
-        this.tokens.push(new Token(TokenType.ERROR, 'Indentation incohérente', this.line, 1, indent))
+        this.tokens.push(new Token(TokenType.ERROR, 'Indentation incohérente', this.line, 1, indent))
       }
     }
   }
@@ -418,7 +419,7 @@ class EtherLexer {
           break
         }
         if (this.peek() === '\n') {
-          this.tokens.push(new Token(TokenType.ERROR, 'Chaîne non terminée', startLine, startCol, this.currentIndent))
+          this.tokens.push(new Token(TokenType.ERROR, 'Chaîne non terminée', startLine, startCol, this.currentIndent))
           return
         }
       }
@@ -674,12 +675,12 @@ class EtherLexer {
 
   normalizeAccents(str) {
     const accentsMap = {
-      'à': 'a', 'â': 'a', 'ä': 'a', 'á': 'a',
-      'è': 'e', 'ê': 'e', 'ë': 'e', 'é': 'e',
-      'ì': 'i', 'î': 'i', 'ï': 'i', 'í': 'i',
-      'ò': 'o', 'ô': 'o', 'ö': 'o', 'ó': 'o',
-      'ù': 'u', 'û': 'u', 'ü': 'u', 'ú': 'u',
-      'ç': 'c', 'ñ': 'n'
+      'à': 'a', 'â': 'a', 'ä': 'a', 'á': 'a',
+      'è': 'e', 'ê': 'e', 'ë': 'e', 'é': 'e',
+      'ì': 'i', 'î': 'i', 'ï': 'i', 'í': 'i',
+      'ò': 'o', 'ô': 'o', 'ö': 'o', 'ó': 'o',
+      'ù': 'u', 'û': 'u', 'ü': 'u', 'ú': 'u',
+      'ç': 'c', 'ñ': 'n'
     }
     return str.toLowerCase().split('').map(c => accentsMap[c] || c).join('')
   }
@@ -718,7 +719,10 @@ class EtherLexer {
       'direction flex', 'enveloppe flex',
       'justifier contenu', 'aligner elements',
       'colonnes grille', 'lignes grille',
-      'style liste', 'type liste',
+      'liste style', 'style liste',
+      'liste type', 'type liste',
+      'liste position', 'position liste',
+      'liste image', 'image liste',
       'couleur fond', 'image fond', 'position fond', 'taille fond',
       'couleur bordure', 'style bordure', 'largeur bordure',
       'espacement lettres', 'espacement mots',
@@ -960,10 +964,11 @@ class EtherLexer {
         break
 
       case ';':
+        this.tokens.push(new Token(TokenType.SEMICOLON, ';', startLine, startCol, this.currentIndent))
         break
 
       default:
-        this.tokens.push(new Token(TokenType.ERROR, `Caractère inattendu: ${char}`, startLine, startCol, this.currentIndent))
+        this.tokens.push(new Token(TokenType.ERROR, `Caractère inattendu: ${char}`, startLine, startCol, this.currentIndent))
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {