aboutsummaryrefslogtreecommitdiffstats
path: root/lib/docbuilder/src/docb_html_util.erl
diff options
context:
space:
mode:
authorKostis Sagonas <[email protected]>2010-02-07 20:17:07 +0200
committerRaimo Niskanen <[email protected]>2010-06-07 13:44:26 +0200
commit3647defb6f32d471355017967bdebb83b5c6224c (patch)
treea42892eff94fd3a9fae3a0885aa1a68424d568f7 /lib/docbuilder/src/docb_html_util.erl
parent39e5ca57147c08502806f873c107c77e197a78ab (diff)
downloadotp-3647defb6f32d471355017967bdebb83b5c6224c.tar.gz
otp-3647defb6f32d471355017967bdebb83b5c6224c.tar.bz2
otp-3647defb6f32d471355017967bdebb83b5c6224c.zip
docbuilder: Clean up as suggested by tidier
Diffstat (limited to 'lib/docbuilder/src/docb_html_util.erl')
-rw-r--r--lib/docbuilder/src/docb_html_util.erl17
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/docbuilder/src/docb_html_util.erl b/lib/docbuilder/src/docb_html_util.erl
index b2951706ea..02ce8b52a7 100644
--- a/lib/docbuilder/src/docb_html_util.erl
+++ b/lib/docbuilder/src/docb_html_util.erl
@@ -136,7 +136,6 @@ copy_pics(Src, Dest, Opts) ->
Dir = code:lib_dir(docbuilder),
InFile = filename:join([Dir, "etc", Src]),
OutFile = docb_util:outfile(Dest, "", Opts),
-
case filelib:last_modified(OutFile) of
0 -> % File doesn't exist
file:copy(InFile, OutFile);
@@ -156,10 +155,10 @@ copy_pics(Src, Dest, Opts) ->
%%--Resolve header data-------------------------------------------------
extract_header_data(Key, {header, [], List}) ->
- case lists:keysearch(Key, 1, List) of
- {value, {Key, [], []}} ->
+ case lists:keyfind(Key, 1, List) of
+ {Key, [], []} ->
"";
- {value, {Key, [], [{pcdata, [], Value}]}} ->
+ {Key, [], [{pcdata, [], Value}]} ->
pcdata_to_html(Value);
false ->
""
@@ -253,7 +252,7 @@ make_anchor_href(HRef) ->
{ok, [HRef]} ->
%% No `#' in HRef, i.e. only path
make_anchor_href(HRef, "");
- {ok, [Path, Fragment]}->
+ {ok, [Path, Fragment]} ->
make_anchor_href(Path, Fragment)
end.
@@ -398,10 +397,10 @@ count_sections([]) ->
%%--Make a ToC----------------------------------------------------------
format_toc(Toc) ->
- lists:map(fun({Number, Title}) ->
- [Number, " <a href = \"#", Number,
- "\">", Title, "</a><br/>\n"]
- end, Toc).
+ [format_toc1(T) || T <- Toc].
+
+format_toc1({Number, Title}) ->
+ [Number, " <a href = \"#", Number, "\">", Title, "</a><br/>\n"].
%%--Convert HTML ISO Latin 1 characters to ordinary characters----------