← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/docbuilder/src/docb_html_util.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/docbuilder/src/docb_html_util.erl
136
136
    Dir = code:lib_dir(docbuilder),
137
137
    InFile = filename:join([Dir, "etc", Src]),
138
138
    OutFile = docb_util:outfile(Dest, "", Opts),
139
 
 
140
139
    case filelib:last_modified(OutFile) of
141
140
        0 -> % File doesn't exist
142
141
            file:copy(InFile, OutFile);
156
155
%%--Resolve header data-------------------------------------------------
157
156
 
158
157
extract_header_data(Key, {header, [], List}) ->
159
 
    case lists:keysearch(Key, 1, List) of
160
 
        {value, {Key, [], []}} ->
 
158
    case lists:keyfind(Key, 1, List) of
 
159
        {Key, [], []} ->
161
160
            "";
162
 
        {value, {Key, [], [{pcdata, [], Value}]}} ->
 
161
        {Key, [], [{pcdata, [], Value}]} ->
163
162
            pcdata_to_html(Value);
164
163
        false ->
165
164
            ""
253
252
        {ok, [HRef]} ->
254
253
            %% No `#' in HRef, i.e. only path
255
254
            make_anchor_href(HRef, "");
256
 
         {ok, [Path, Fragment]}->
 
255
         {ok, [Path, Fragment]} ->
257
256
            make_anchor_href(Path, Fragment)
258
257
    end.
259
258
 
398
397
%%--Make a ToC----------------------------------------------------------
399
398
 
400
399
format_toc(Toc) ->
401
 
    lists:map(fun({Number, Title}) ->
402
 
                      [Number, " <a href = \"#", Number,
403
 
                       "\">", Title, "</a><br/>\n"]
404
 
              end, Toc).
 
400
    [format_toc1(T) || T <- Toc].
 
401
 
 
402
format_toc1({Number, Title}) ->
 
403
    [Number, " <a href = \"#", Number, "\">", Title, "</a><br/>\n"].
405
404
 
406
405
%%--Convert HTML ISO Latin 1 characters to ordinary characters----------
407
406