Update and synchronize ehtml documentation

erlyaws · Aug 25, 2014 · cbbbdbe · cbbbdbe
1 parent 89ce1d6
commit cbbbdbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/doc/yaws.tex b/doc/yaws.tex
@@ -524,8 +524,8 @@ \section{EHTML}
 
 $HtmlAttribute = atom()$
 
-$Value = string() | atom() |
-         \{Module, Fun, [Args]\} | fun/0$
+$Value = string() | atom() | integer() | float() |\\*
+\hspace*{0.55 in} \{Module, Fun, [Args]\} | fun/0$
 
 $Body  = EHTML$
 

diff --git a/man/yaws_api.5 b/man/yaws_api.5
@@ -744,11 +744,13 @@ is
 \fI
 .nf
 EHTML = [EHTML] | {Tag, Attrs, Body} | {Tag, Attrs} | {Tag} |
+        {Module, Fun, [Args]} | fun/0 |
         binary() | character()
-Tag      = atom()
-Attrs = [{Key, Value}]  or {EventTag, {jscall, FunName, [Args]}}
-Key      = atom()
-Value = string()
+Tag   = atom()
+Attrs = [{Key, Value}]
+Key   = atom()
+Value = string() | atom() | integer() | float() |
+        {Module, Fun, [Args]} | fun/0
 Body  = EHTML
 .fi
 \fR

diff --git a/src/yaws_api.erl b/src/yaws_api.erl
@@ -1723,12 +1723,13 @@ is_abs_URI1(_) ->
 %% ------------------------------------------------------------
 %% simple erlang term representation of HTML:
 %% EHTML = [EHTML] | {Tag, Attrs, Body} | {Tag, Attrs} | {Tag} |
-%%         {Module, Fun, [Args]} | fun/0
+%%         {Module, Fun, [Args]} | fun/0 |
 %%         binary() | character()
 %% Tag   = atom()
-%% Attrs = [{Key, Value}]  or {EventTag, {jscall, FunName, [Args]}}
+%% Attrs = [{Key, Value}]
 %% Key   = atom()
-%% Value = string() | {Module, Fun, [Args]} | fun/0
+%% Value = string() | atom() | integer() | float() |
+%%         {Module, Fun, [Args]} | fun/0
 %% Body  = EHTML
 
 ehtml_expand(Ch) when Ch >= 0, Ch =< 255 -> Ch; %yaws_api:htmlize_char(Ch);