diff --git a/Documentation/cgal_stylesheet.css b/Documentation/cgal_stylesheet.css index bfbccb1966f..998ffa45cdd 100644 --- a/Documentation/cgal_stylesheet.css +++ b/Documentation/cgal_stylesheet.css @@ -173,7 +173,10 @@ div.groupText { } #doc-content { + /* this is the header/footer padding */ + /* so the content does not hide behind them */ padding-top: 91px; + padding-bottom: 32px; overflow: visible; } @@ -192,3 +195,12 @@ div.groupText { padding-top: 91px; margin-top: -91px; } + +#doc-content .anchor { + padding-top: 91px; + margin-top: -91px; +} + +#MSearchResultsWindow { + z-index: 2; +} \ No newline at end of file diff --git a/Documentation/conceptify.py b/Documentation/conceptify.py index 2c1bba8c086..ac51f1a65a7 100755 --- a/Documentation/conceptify.py +++ b/Documentation/conceptify.py @@ -21,7 +21,7 @@ def conceptify_nested_classes(d): def conceptify(d): # fix the title title = d(".title") - title.html(re.sub("Class Reference", "Concept Reference", title.html())) + title.html(re.sub("Class( Template)? Reference", "Concept Reference", title.html())) # remove the include include_statement = d(".contents").children().eq(0) # should check that this is really the div we think it is @@ -30,7 +30,7 @@ def conceptify(d): conceptify_nested_classes(d) def write_out_html(d, fn): - f = open(fn, 'w') + f = open(fn, 'w', encoding='utf-8') # this is the normal doxygen doctype, which is thrown away by pyquery f.write('\n') print(d, file=f) @@ -40,7 +40,10 @@ def write_out_html(d, fn): def clean_doc(): duplicate_files=glob.glob('./output/CGAL.CGAL.*/html/jquery.js') duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/html/dynsections.js')) + duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/html/resize.js')) duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/html/stylesheet.css')) + # kill _all_, including the one in CGAL.CGAL tabs.css files + duplicate_files.extend(glob.glob('./output/CGAL.CGAL*/html/tabs.css')) # left-over by doxygen? duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/bib2xhtml.pl')) duplicate_files.extend(glob.glob('./output/CGAL.CGAL.*/cgal_manual.bib')) @@ -54,14 +57,14 @@ def clean_doc(): # from http://stackoverflow.com/a/1597755/105672 def re_replace_in_file(pat, s_after, fname): # first, see if the pattern is even in the file. - with open(fname) as f: + with open(fname, encoding='utf-8') as f: if not any(re.search(pat, line) for line in f): return # pattern does not occur in file so we are done. # pattern is in the file, so perform replace operation. - with open(fname) as f: + with open(fname, encoding='utf-8') as f: out_fname = fname + ".tmp" - out = open(out_fname, "w") + out = open(out_fname, "w", encoding='utf-8') for line in f: out.write(re.sub(pat, s_after, line)) out.close() diff --git a/Documentation/hacks.js b/Documentation/hacks.js index 96398294d75..ebcd2d78cd7 100644 --- a/Documentation/hacks.js +++ b/Documentation/hacks.js @@ -1,6 +1,6 @@ function generate_autotoc() { var toc = $("#autotoc").append(''); - if(toc) { + if(toc.length > 1) { // an autotoc has been requested toc = toc.find('ul'); $("h1, h2, h3").each(function(i) { var current = $(this); @@ -8,6 +8,7 @@ function generate_autotoc() { var cur_id = current.attr("id"); if(cur_id == undefined) { current.attr('id', 'title' + i); + current.addClass('anchor'); toc.append("
  • " + current.text() + "
    • "); } else { @@ -18,24 +19,6 @@ function generate_autotoc() { } } -// hack around a bug in resize.js. The original resizeHeight is not -// considering margins or borders when calculating the div heights. Our -// ready hook is run after the original resize. We fixup the footer -// variable and then do our thing. -function fix_resize() { - footer = $("#footer"); - resizeHeight = function() { - var headerHeight = header.outerHeight(true); - var footerHeight = footer.outerHeight(true); - var windowHeight = $(window).outerHeight(true) - headerHeight - footerHeight; - content.css({height:windowHeight + "px"}); - navtree.css({height:windowHeight + "px"}); - sidenav.css({height:windowHeight + "px",top: headerHeight+"px"}); - } - $(window).resize(resizeHeight); - $(window).resize(); -} - // throw a stick at the modules array and hijack gotoNode // for our own evil purposes $(document).ready(function() { @@ -65,7 +48,6 @@ $(document).ready(function() { $("#doc-content").append('
      '); $("body").footnotes(); generate_autotoc(); - // fix_resize(); }); diff --git a/Documentation/header.html b/Documentation/header.html index 634d38dbb58..d610f77dc69 100644 --- a/Documentation/header.html +++ b/Documentation/header.html @@ -21,6 +21,13 @@ $search diff --git a/Documentation/header_package.html b/Documentation/header_package.html index a3e732be847..d3526345931 100644 --- a/Documentation/header_package.html +++ b/Documentation/header_package.html @@ -10,9 +10,16 @@ - + $search