Merge branch 'maxim-top:master' into master

scripts/subdirectory_summary.escript

@@ -82,14 +82,17 @@ links_title(BaseDir) ->
 make_relative_link(ParentLink, Link) ->
     PUrl = markdown_to_html_url(ParentLink),
     Url = markdown_to_html_url(Link),
-    calculate_relative_path(PUrl, Url).
+    Res = calculate_relative_path(PUrl, Url),
+    Res2 = markdown_to_html_url_remove_readme(Res),
+    io:format("make_relative_link: ParentLink: ~p, Link: ~p, PUrl: ~p, Url: ~p, Res: ~p, Res2:~p~n", [ParentLink, Link, PUrl, Url, Res, Res2]),
+    Res2.
 
 calculate_relative_path(From, To) ->
     FromAdjusted = ensure_trailing_slash(From),
     ToAdjusted = ensure_trailing_slash(To),
     FromList = string:tokens(FromAdjusted, "/"),
     ToList = string:tokens(ToAdjusted, "/"),
-    {_, FromSuffix, ToSuffix} = find_common_path(FromList, ToList, [], []),
+    {CommonPath, FromSuffix, ToSuffix} = find_common_path(FromList, ToList, [], []),
     UpSteps = max(0, length(FromSuffix) - 1),
     UpPath = lists:duplicate(UpSteps, ".."),
     RelativePathList = UpPath ++ ToSuffix,
@@ -122,11 +125,15 @@ markdown_to_html_file(File) ->
     Bin2 = binary:replace(Bin1, <<".md">>, <<".html">>),
     "_book/"++binary_to_list(Bin2).
 
+markdown_to_html_url_remove_readme(File) ->
+    Bin = iolist_to_binary(File),
+    Bin1 = binary:replace(Bin, <<"README.html">>, <<"">>),
+    binary_to_list(Bin1).
+
 markdown_to_html_url(File) ->
     Bin = iolist_to_binary(File),
-    Bin1 = binary:replace(Bin, <<"README.md">>, <<"">>),
-    Bin2 = binary:replace(Bin1, <<".md">>, <<".html">>),
-    "_book/"++binary_to_list(Bin2).
+    Bin2 = binary:replace(Bin, <<".md">>, <<".html">>),
+    binary_to_list(Bin2).
 
 parse_line(Line) ->
     {match, [[_, {TitleStart, TitleLen},{LinkStart, LinkLen}]]} = re:run(Line, "\\[(.*)\\]\\((.*)\\)", [global]),