Add HTML5 tags to HTML mode

* lisp/textmodes/sgml-mode.el (html-tag-alist): Add HTML5 tags.
(html-tag-help): Add short descriptions of those tags.

1 files changed, 51 insertions, 0 deletions

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 0937c00fbd0..990c09bfda7 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1818,6 +1818,8 @@ This takes effect when first loading the library.")
       ("col" t ,@cellhalign ,@cellvalign ("span") ("width"))
       ("colgroup" \n ,@cellhalign ,@cellvalign ("span") ("width"))
       ("dir" ,@list)
+      ("figcaption")
+      ("figure" \n)
       ("font" nil "size" ("-1") ("+1") ("-2") ("+2") ,@1-7)
       ("form" (\n _ \n "<input type=\"submit\" value=\"\""
 	       (if sgml-xml-mode " />" ">"))
@@ -1872,7 +1874,13 @@ This takes effect when first loading the library.")
       ("article" \n)
       ("aside" \n)
       ("au")
+      ("audio" \n
+       ("src") ("crossorigin" ("anonymous") ("use-credentials"))
+       ("preload" ("none") ("metadata") ("auto"))
+       ("autoplay" "autoplay") ("mediagroup") ("loop" "loop")
+       ("muted" "muted") ("controls" "controls"))
       ("b")
+      ("bdi")
       ("bdo" nil ("lang") ("dir" ("ltr") ("rtl")))
       ("big")
       ("blink")
@@ -1885,10 +1893,12 @@ This takes effect when first loading the library.")
        ("type" ("submit") ("reset") ("button"))
        ("disabled" "disabled")
        ("tabindex") ("accesskey") ("onfocus") ("onblur"))
+      ("canvas" \n ("width") ("height"))
       ("caption" ("valign" ("top") ("bottom")))
       ("center" \n)
       ("cite")
       ("code" \n)
+      ("datalist" \n)
       ("dd" ,(not sgml-xml-mode))
       ("del" nil ("cite") ("datetime"))
       ("dfn")
@@ -1900,6 +1910,7 @@ This takes effect when first loading the library.")
       ("dt" (t _ (if sgml-xml-mode "</dt>")
              "<dd>" (if sgml-xml-mode "</dd>") \n))
       ("em")
+      ("embed" t ("src") ("type") ("width") ("height"))
       ("fieldset" \n)
       ("fn" "id" "fn")  ;; Footnotes were deprecated in HTML 3.2
       ("footer" \n)
@@ -1928,9 +1939,13 @@ This takes effect when first loading the library.")
       ("lang")
       ("legend" nil ("accesskey"))
       ("li" ,(not sgml-xml-mode))
+      ("main" \n)
       ("map" \n ("name"))
+      ("mark")
       ("math" \n)
       ("meta" t ("http-equiv") ("name") ("content") ("scheme"))
+      ("meter" nil ("value") ("min") ("max") ("low") ("high")
+       ("optimum"))
       ("nav" \n)
       ("nobr")
       ("noframes" \n)
@@ -1942,18 +1957,24 @@ This takes effect when first loading the library.")
        ("disabled" "disabled") ("tabindex") ("onfocus") ("onblur")
        ("onchange"))
       ("option" t ("value") ("label") ("selected" t))
+      ("output" nil ("for") ("form") ("name"))
       ("over" t)
       ("param" t ("name") ("value")
        ("valuetype" ("data") ("ref") ("object")) ("type"))
       ("person") ;; Tag for person's name tag deprecated in HTML 3.2
       ("pre" \n)
+      ("progress" nil ("value") ("max"))
       ("q" nil ("cite"))
       ("rev")
+      ("rp" t)
+      ("rt" t)
+      ("ruby")
       ("s")
       ("samp")
       ("script" nil ("charset") ("type") ("src") ("defer" "defer"))
       ("section" \n)
       ("small")
+      ("source" t ("src") ("type") ("media"))
       ("span" nil
 	("class"
 	 ("builtin")
@@ -1968,12 +1989,23 @@ This takes effect when first loading the library.")
       ("strong")
       ("style" \n ("type") ("media") ("title"))
       ("sub")
+      ("summary")
       ("sup")
+      ("time" nil ("datetime"))
       ("title")
       ("tr" t)
+      ("track" t
+       ("kind" ("subtitles") ("captions") ("descriptions")
+        ("chapters") ("metadata"))
+       ("src") ("srclang") ("label") ("default"))
       ("tt")
       ("u")
       ("var")
+      ("video" \n
+       ("src") ("crossorigin" ("anonymous") ("use-credentials"))
+       ("poster") ("preload" ("none") ("metadata") ("auto"))
+       ("autoplay" "autoplay") ("mediagroup") ("loop" "loop")
+       ("muted" "muted") ("controls" "controls") ("width") ("height"))
       ("wbr" t)))
   "Value of `sgml-tag-alist' for HTML mode.")
 
@@ -1988,8 +2020,10 @@ This takes effect when first loading the library.")
     ("article" . "An independent part of document or site")
     ("aside" . "Secondary content related to surrounding content (e.g. page or article)")
     ("au" . "Author")
+    ("audio" . "Sound or audio stream")
     ("b" . "Bold face")
     ("base" . "Base address for URLs")
+    ("bdi" . "Text isolated for bidirectional formatting")
     ("bdo" . "Override text directionality")
     ("big" . "Font size")
     ("blink" . "Blinking text")
@@ -1998,6 +2032,7 @@ This takes effect when first loading the library.")
     ("box" . "Math fraction")
     ("br" . "Line break")
     ("button" . "Clickable button")
+    ("canvas" . "Script generated graphics canvas")
     ("caption" . "Table caption")
     ("center" . "Centered text")
     ("changed" . "Change bars")
@@ -2005,6 +2040,7 @@ This takes effect when first loading the library.")
     ("code" . "Formatted source code")
     ("col" . "Group of attribute specifications for table columns")
     ("colgroup" . "Group of columns")
+    ("datalist" . "A set of predefined options")
     ("dd" . "Definition of term")
     ("del" . "Deleted text")
     ("dfn" . "Defining instance of a term")
@@ -2017,8 +2053,10 @@ This takes effect when first loading the library.")
     ("fieldset" . "Group of related controls and labels")
     ("fig" . "Figure")
     ("figa" . "Figure anchor")
+    ("figcaption" . "Caption for a figure")
     ("figd" . "Figure description")
     ("figt" . "Figure text")
+    ("figure" . "Self-contained content, often with a caption")
     ("fn" . "Footnote")  ;; No one supports special footnote rendering.
     ("font" . "Font size")
     ("footer" . "Footer of a section")
@@ -2049,10 +2087,13 @@ This takes effect when first loading the library.")
     ("legend" . "Caption for a fieldset")
     ("li" . "List item")
     ("link" . "Link relationship")
+    ("main" . "Main content of the document body")
     ("map" . "Image map (a clickable link area")
+    ("mark" . "Highlighted text")
     ("math" . "Math formula")
     ("menu" . "List of commands")
     ("meta" . "Document properties")
+    ("meter" . "Scalar measurement within a known range")
     ("mh" . "Form mail header")
     ("nav" . "Group of navigational links")
     ("nextid" . "Allocate new id")
@@ -2063,25 +2104,32 @@ This takes effect when first loading the library.")
     ("ol" . "Ordered list")
     ("optgroup" . "Group of options")
     ("option" . "Selection list item")
+    ("output" . "Result of a calculation or user action")
     ("over" . "Math fraction rule")
     ("p" . "Paragraph start")
     ("panel" . "Floating panel")
     ("param" . "Parameters for an object")
     ("person" . "Person's name")
     ("pre" . "Preformatted fixed width text")
+    ("progress" . "Completion progress of a task")
     ("q" . "Quotation")
     ("rev" . "Reverse video")
+    ("rp" . "Fallback text for when ruby annotations aren't supported")
+    ("rt" . "Ruby text component of a ruby annotation")
+    ("ruby" . "Ruby annotation")
     ("s" . "Strikeout")
     ("samp" . "Sample text")
     ("script" . "Executable script within a document")
     ("section" . "Section of a document")
     ("select" . "Selection list")
     ("small" . "Font size")
+    ("source" . "Media resource for media elements")
     ("sp" . "Nobreak space")
     ("span" . "Generic inline container")
     ("strong" . "Standout text")
     ("style" . "Style information")
     ("sub" . "Subscript")
+    ("summary" . "Summary, caption, or legend")
     ("sup" . "Superscript")
     ("table" . "Table with rows and columns")
     ("tb" . "Table vertical break")
@@ -2091,12 +2139,15 @@ This takes effect when first loading the library.")
     ("tfoot" . "Table foot")
     ("th" . "Table header cell")
     ("thead" . "Table head")
+    ("time" . "Content with optional machine-readable timestamp")
     ("title" . "Document title")
     ("tr" . "Table row separator")
+    ("track" . "Timed text track for media elements")
     ("tt" . "Typewriter face")
     ("u" . "Underlined text")
     ("ul" . "Unordered list")
     ("var" . "Math variable face")
+    ("video" . "Video or movie")
     ("wbr" . "Enable <br> within <nobr>"))
   "Value of variable `sgml-tag-help' for HTML mode.")