From 3c41eac35d2e33f367badd8e310f9e2891c21d01 Mon Sep 17 00:00:00 2001
From: Akira Takahashi <faithandbrave@gmail.com>
Date: Thu, 30 Jun 2022 14:12:16 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=86=85=E9=83=A8=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E3=82=92=E7=9B=B8=E5=AF=BE=E3=83=AA=E3=83=B3=E3=82=AF?=
 =?UTF-8?q?=E3=81=A7=E7=94=9F=E6=88=90=E3=81=99=E3=82=8B=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=20with=20`settings.USE=5FRELATIVE=5FLINK=20=3D=20True`"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                      |  5 -----
 README.md                       |  4 ----
 boostjp/templates/base.html     | 18 +++++++++---------
 boostjp/templates/content.html  |  6 +++---
 cpprefjp/ghwebhook_on_user.sh   |  1 -
 cpprefjp/templates/base.html    | 28 ++++++++++++++--------------
 cpprefjp/templates/content.html |  6 +++---
 crsearch.json/run.py            |  5 +----
 markdown_to_html                |  2 +-
 run.py                          | 28 +++-------------------------
 settings/boostjp.py             |  5 -----
 settings/boostjp_relative.py    | 13 -------------
 settings/cpprefjp.py            |  6 ------
 settings/cpprefjp_relative.py   | 11 -----------
 14 files changed, 34 insertions(+), 104 deletions(-)
 delete mode 100644 settings/boostjp_relative.py
 delete mode 100644 settings/cpprefjp_relative.py

diff --git a/.gitignore b/.gitignore
index 746a1d7..f241645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,11 @@
 *.pyc
 cpprefjp/site/
-cpprefjp/image/
 cpprefjp/cpprefjp.github.io/
-cpprefjp/cpprefjp.relative/
 boostjp/site/
-boostjp/image/
 boostjp/boostjp.github.io/
-boostjp/boostjp.relative/
 settings.*.cache
 
 /crsearch.json/crsearch.json
-/crsearch.json/crsearch.js
 /cpprefjp/static/static/kunai
 /cpprefjp/static/static/crsearch/*
 
diff --git a/README.md b/README.md
index 167b6f8..fff596a 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,6 @@ $ git submodule update -i
 
 ```bash
 git clone https://github.com/cpprefjp/site.git cpprefjp/site
-git clone https://github.com/cpprefjp/image.git cpprefjp/image
 
 # kunai 用のデータを生成する
 git clone https://github.com/cpprefjp/kunai.git
@@ -46,7 +45,6 @@ popd
 mkdir -p cpprefjp/static/static/crsearch
 pushd cpprefjp/static/static/crsearch
 ln -s ../../../../crsearch.json/crsearch.json crsearch.json
-ln -s ../../../../crsearch.json/crsearch.js crsearch.js # Optional (ローカル file:///... で閲覧する場合に必要)
 popd
 
 # site_generator 用の docker イメージを生成する
@@ -58,7 +56,6 @@ popd
 ```bash
 # この辺は必要に応じて実行する
 (cd cpprefjp/site && git pull)
-(cd cpprefjp/image && git pull)
 ./crsearch.json/docker.sh run
 ./kunai/docker.sh run build
 
@@ -77,7 +74,6 @@ http://localhost:8000 を開けば `index.html` が表示されます。
 
 ```bash
 git clone https://github.com/boostjp/site.git boostjp/site
-git clone https://github.com/boostjp/image.git boostjp/image
 
 # site_generator 用の docker イメージを生成する
 ./docker.sh build
diff --git a/boostjp/templates/base.html b/boostjp/templates/base.html
index c746e4c..94310e2 100644
--- a/boostjp/templates/base.html
+++ b/boostjp/templates/base.html
@@ -25,15 +25,15 @@
 
         {% block rss %}{% endblock %}
 
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-<link rel="stylesheet" href="{{ relative_base }}/static/pygments/default.css">
-<!-- <link rel="stylesheet" href="{{ relative_base }}/static/css/root.css"> -->
+<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+<link rel="stylesheet" href="/static/pygments/default.css">
+<!-- <link rel="stylesheet" href="/static/css/root.css"> -->
 
-<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-<!-- <script src="https://platform.twitter.com/widgets.js"></script> -->
+<script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
+<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
+<!-- <script src="//platform.twitter.com/widgets.js"></script> -->
 
-<!-- <script src="{{ relative_base }}/static/js/root.js"></script> -->
+<!-- <script src="/static/js/root.js"></script> -->
 
         {% block mathjax %}{% endblock %}
 
@@ -254,7 +254,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="{{ relative_index }}">
+        <a class="navbar-brand" href="/">
           <div class="title-wrapper clearfix">
             <div class="title">{% block brand %}{% endblock %}</div>
           </div>
@@ -326,7 +326,7 @@
     </body>
     <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.  chromium.org/developers/how-tos/chrome-frame-getting-started -->
     <!--[if lt IE 7 ]>
-        <script src="https://ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
+        <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
         <script>
             window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
         </script>
diff --git a/boostjp/templates/content.html b/boostjp/templates/content.html
index 50e9fac..3482129 100644
--- a/boostjp/templates/content.html
+++ b/boostjp/templates/content.html
@@ -15,7 +15,7 @@
       <li {{ 'style="display: none"' if not parent_opened }} class="parent_li {{ 'active' if child.opened }}">
         <span class="treespan" onclick="tree_onclick.call(this, event)"><i class="glyphicon {{ 'glyphicon-minus' if child.opened else 'glyphicon-plus' }}"></i></span>
         {% if child.href %}
-          <a href="{{ relative_base }}{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
+          <a href="{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
         {% else %}
           {{ child.title|e }}{{ child.encoded_cpp_meta }}
         {% endif %}
@@ -26,7 +26,7 @@
     {% else %}
       <li {{ 'style="display: none"' if not parent_opened }}>
         {% if child.href %}
-          <a href="{{ relative_base }}{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
+          <a href="{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
         {% else %}
           {{ child.title|e }}{{ child.encoded_cpp_meta }}
         {% endif %}
@@ -49,7 +49,7 @@
       <li {{ 'class="active"' if header.is_active }} itemscope itemtype="http://www.schema.org/SiteNavigationElement">
         <span>
           {% if not header.is_active and header.href %}
-            <a href="{{ relative_base }}{{ header.href }}" itemprop="url">
+            <a href="{{ header.href }}" itemprop="url">
               {% if loop.index == 1 %}
                 <i class="glyphicon glyphicon-home"></i>
               {% else %}
diff --git a/cpprefjp/ghwebhook_on_user.sh b/cpprefjp/ghwebhook_on_user.sh
index 9df0e91..b09a518 100755
--- a/cpprefjp/ghwebhook_on_user.sh
+++ b/cpprefjp/ghwebhook_on_user.sh
@@ -60,7 +60,6 @@ cp crsearch.json/crsearch.json cpprefjp/static/static/crsearch/
 # サイト生成
 clone_and_fallback cpprefjp/cpprefjp.github.io git@github.com:cpprefjp/cpprefjp.github.io.git
 clone_and_fallback cpprefjp/site git@github.com:cpprefjp/site.git
-clone_and_fallback cpprefjp/image git@github.com:cpprefjp/image.git
 ./docker.sh build
 ./docker.sh run settings.cpprefjp "$@"
 
diff --git a/cpprefjp/templates/base.html b/cpprefjp/templates/base.html
index 8f06c37..92f9c6d 100644
--- a/cpprefjp/templates/base.html
+++ b/cpprefjp/templates/base.html
@@ -21,25 +21,25 @@
 
         {% block rss %}{% endblock %}
 
-<link rel="apple-touch-icon" sizes="180x180" href="{{ relative_base }}/static/favicons/apple-touch-icon.png{{ cachebust }}">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ relative_base }}/static/favicons/favicon-32x32.png{{ cachebust }}">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ relative_base }}/static/favicons/favicon-16x16.png{{ cachebust }}">
-<link rel="manifest" href="{{ relative_base }}/manifest.json{{ cachebust }}">
-<link rel="mask-icon" href="{{ relative_base }}/static/favicons/safari-pinned-tab.svg{{ cachebust }}" color="#f5f8fc">
+<link rel="apple-touch-icon" sizes="180x180" href="/static/favicons/apple-touch-icon.png{{ cachebust }}">
+<link rel="icon" type="image/png" sizes="32x32" href="/static/favicons/favicon-32x32.png{{ cachebust }}">
+<link rel="icon" type="image/png" sizes="16x16" href="/static/favicons/favicon-16x16.png{{ cachebust }}">
+<link rel="manifest" href="/static/favicons/manifest.json{{ cachebust }}">
+<link rel="mask-icon" href="/static/favicons/safari-pinned-tab.svg{{ cachebust }}" color="#f5f8fc">
 <meta name="theme-color" content="#f5f8fc">
 
-<link rel="stylesheet" href="{{ relative_base }}/static/pygments/default.css{{ cachebust }}">
-<!-- <link rel="stylesheet" href="{{ relative_base }}/static/css/root.css"> -->
+<link rel="stylesheet" href="/static/pygments/default.css{{ cachebust }}">
+<!-- <link rel="stylesheet" href="/static/css/root.css"> -->
 
         {% block mathjax %}{% endblock %}
 
-<link href="{{ relative_base }}/static/kunai/css/kunai-stage-0.css{{ cachebust }}" rel="stylesheet">
-<link href="{{ relative_base }}/static/kunai/css/kunai-stage-1.css{{ cachebust }}" rel="stylesheet">
-<link href="{{ relative_base }}/static/kunai/css/kunai-stage-2.css{{ cachebust }}" rel="stylesheet">
-<link href="{{ relative_base }}/static/kunai/css/kunai-stage-3.css{{ cachebust }}" rel="stylesheet">
+<link href="/static/kunai/css/kunai-stage-0.css{{ cachebust }}" rel="stylesheet">
+<link href="/static/kunai/css/kunai-stage-1.css{{ cachebust }}" rel="stylesheet">
+<link href="/static/kunai/css/kunai-stage-2.css{{ cachebust }}" rel="stylesheet">
+<link href="/static/kunai/css/kunai-stage-3.css{{ cachebust }}" rel="stylesheet">
 
-<script type="text/javascript" src="{{ relative_base }}/static/kunai/js/kunai-vendor.js{{ cachebust }}"></script>
-<script type="text/javascript" src="{{ relative_base }}/static/kunai/js/kunai.js{{ cachebust }}"></script>
+<script type="text/javascript" src="/static/kunai/js/kunai-vendor.js{{ cachebust }}"></script>
+<script type="text/javascript" src="/static/kunai/js/kunai.js{{ cachebust }}"></script>
 
 <script type="text/javascript">
   document.addEventListener('DOMContentLoaded', function() {
@@ -61,7 +61,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="{{ relative_index }}">
+        <a class="navbar-brand" href="/">
           <div class="title-wrapper clearfix">
             <div class="title">{% block brand %}{% endblock %}</div>
           </div>
diff --git a/cpprefjp/templates/content.html b/cpprefjp/templates/content.html
index fc96c5d..0fede16 100644
--- a/cpprefjp/templates/content.html
+++ b/cpprefjp/templates/content.html
@@ -17,7 +17,7 @@
       <li class="parent_li {{ 'active' if child.opened }}">
         <span class="treespan"></span>
         {% if child.href %}
-          <a href="{{ relative_base }}{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
+          <a href="{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
         {% else %}
           {{ child.title|e }}{{ child.encoded_cpp_meta }}
         {% endif %}
@@ -28,7 +28,7 @@
     {% else %}
       <li>
         {% if child.href %}
-          <a href="{{ relative_base }}{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
+          <a href="{{ child.href }}">{{ child.title|e }}</a>{{ child.encoded_cpp_meta }}
         {% else %}
           {{ child.title|e }}{{ child.encoded_cpp_meta }}
         {% endif %}
@@ -58,7 +58,7 @@
       <li {{ 'class="active"' if header.is_active }} itemscope itemtype="http://www.schema.org/SiteNavigationElement">
         <span>
           {% if not header.is_active and header.href %}
-            <a href="{{ relative_base }}{{ header.href }}" itemprop="url">
+            <a href="{{ header.href }}" itemprop="url">
               {% if loop.index == 1 %}
                 <i class="fa fa-fw fa-home"></i>
               {% else %}
diff --git a/crsearch.json/run.py b/crsearch.json/run.py
index e989cf3..e048b3b 100644
--- a/crsearch.json/run.py
+++ b/crsearch.json/run.py
@@ -449,11 +449,8 @@ def main():
     paths = chain.from_iterable([get_files(d) for d in _KNOWN_DIRS])
     all_paths = list(get_files('site'))
     result = Generator().generate('site', paths, all_paths)
-    crsearch_json = json.dumps(result, separators=(',', ':'), ensure_ascii=False, sort_keys=True)
     with open('crsearch.json', 'wb') as f:
-        f.write(crsearch_json.encode('utf-8'))
-    with open('crsearch.js', 'wb') as f:
-        f.write(('callback(%s)' % crsearch_json).encode('utf-8'))
+        f.write(json.dumps(result, separators=(',', ':'), ensure_ascii=False, sort_keys=True).encode('utf-8'))
 
 
 if __name__ == '__main__':
diff --git a/markdown_to_html b/markdown_to_html
index 6126f47..9c694ae 160000
--- a/markdown_to_html
+++ b/markdown_to_html
@@ -1 +1 @@
-Subproject commit 6126f4723c07fcad8390fddb019a7dd02ad0198c
+Subproject commit 9c694ae4083fc57456bee0156cf283be393af1e4
diff --git a/run.py b/run.py
index 9d00cd0..224c9dd 100755
--- a/run.py
+++ b/run.py
@@ -6,7 +6,6 @@
 import importlib
 import json
 import os
-import posixpath
 import re
 import subprocess
 import sys
@@ -70,9 +69,6 @@ def md_to_html(md_data, path, hrefs=None, global_qualify_list=None):
         'base_path': '/'.join(paths[:-1]),
         'full_path': path + '.md',
         'extension': '.html',
-        'use_relative_link': settings.USE_RELATIVE_LINK,
-        'image_repo': settings.IMAGE_REPO,
-        'use_static_image': settings.IMAGE_DIR is not None,
     }
     extension_configs['codehilite'] = {
         'noclasses': False
@@ -505,11 +501,11 @@ def convert_pageinfo(pageinfo, sidebar, sidebar_index, template, hrefs, global_q
         sidebar.set_active(pageinfo['paths'])
 
     content_header = ContentHeader(pageinfo['paths'], sidebar, sidebar_index)
-    context = {
+    convert(pageinfo['path'], template, {
         'title': (
             pageinfo['title'] if pageinfo['is_index'] else
             pageinfo['title'] + settings.TITLE_SUFFIX),
-        'url': settings.BASE_URL + pageinfo['href'],
+        'url': settings.BASE_URL + '/' + pageinfo['href'],
         'description': pageinfo['description'],
         'cachebust': _CACHEBUST,
         'disable_sidebar': settings.DISABLE_SIDEBAR,
@@ -525,18 +521,7 @@ def convert_pageinfo(pageinfo, sidebar, sidebar_index, template, hrefs, global_q
         'project_name': settings.PROJECT_NAME,
         'latest_commit_info': latest_commit_info,
         'keywords': settings.META_KEYWORDS,
-        'relative_base': '',
-        'relative_index': '/'
-    }
-    if settings.USE_RELATIVE_LINK:
-        url_current_dir = posixpath.dirname(context['url'])
-        context['relative_base'] = posixpath.relpath(settings.BASE_URL, url_current_dir)
-        # Note: ローカル (file:///) で閲覧時にディレクトリを開いてしまわないように "/" で終わらず "index.html"も明示する。
-        context['relative_index'] = posixpath.relpath(settings.BASE_URL, url_current_dir) + '/index.html'
-        # Note: 以下は <meta /> で埋め込む情報なので敢えて相対パスにはしない。
-        # context['url'] = posixpath.relpath(context['url'], url_current_dir)
-        # context['rss'] = posixpath.relpath(context['rss'], url_current_dir)
-    convert(pageinfo['path'], template, context, hrefs, global_qualify_list)
+    }, hrefs, global_qualify_list)
 
 
 def main():
@@ -606,13 +591,6 @@ def run(pageinfos):
     # 静的ファイルをコピーする
     subprocess.call(['cp', '-v', '-RL'] + glob.glob(os.path.join(settings.STATIC_DIR, '*')) + [settings.OUTPUT_DIR])
 
-    # 画像リポジトリ (image) の画像ファイル (*.png, *.jpg, *.svg) をコピーする
-    if settings.IMAGE_DIR is not None:
-        os.system("cd '%s' && find . -name '*.png' -or -name '*.jpg' -or -name '*.svg' | tee /dev/stderr | cpio -updmv '%s'" % (
-            settings.IMAGE_DIR,
-            os.path.relpath(os.path.join(settings.OUTPUT_DIR, 'static/image'), settings.IMAGE_DIR)
-        ))
-
 
 if __name__ == '__main__':
     main()
diff --git a/settings/boostjp.py b/settings/boostjp.py
index afbf175..5a0fa1e 100644
--- a/settings/boostjp.py
+++ b/settings/boostjp.py
@@ -10,10 +10,6 @@
 # 静的ファイルディレクトリ
 STATIC_DIR = 'boostjp/static'
 
-# 画像ファイルディレクトリ / GitHubリポジトリ
-IMAGE_DIR = 'boostjp/image'
-IMAGE_REPO = 'boostjp/image'
-
 # 出力ディレクトリ
 OUTPUT_DIR = 'boostjp/boostjp.github.io'
 
@@ -85,7 +81,6 @@
 # 'git' => CACHEBUST_DIR のディレクトリの git rev-parse HEAD の結果を使う
 CACHEBUST_TYPE = 'time'
 
-USE_RELATIVE_LINK = False
 
 # 並び替えルール
 def get_order_priority(name):
diff --git a/settings/boostjp_relative.py b/settings/boostjp_relative.py
deleted file mode 100644
index 939bee3..0000000
--- a/settings/boostjp_relative.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from .boostjp import *  # NOQA
-
-USE_MINIFY = False
-
-OUTPUT_DIR = 'boostjp/boostjp.relative'
-GOOGLE_ANALYTICS = ''
-USE_RELATIVE_LINK = True
diff --git a/settings/cpprefjp.py b/settings/cpprefjp.py
index d3c213b..68632b7 100644
--- a/settings/cpprefjp.py
+++ b/settings/cpprefjp.py
@@ -10,10 +10,6 @@
 # 静的ファイルディレクトリ
 STATIC_DIR = 'cpprefjp/static'
 
-# 画像ファイルディレクトリ / GitHubリポジトリ
-IMAGE_DIR = 'cpprefjp/image'
-IMAGE_REPO = 'cpprefjp/image'
-
 # 出力ディレクトリ
 OUTPUT_DIR = 'cpprefjp/cpprefjp.github.io'
 
@@ -85,8 +81,6 @@
 CACHEBUST_TYPE = 'git'
 CACHEBUST_DIR = 'kunai'
 
-USE_RELATIVE_LINK = False
-
 # 並び替えルール
 ORDER_PRIORITY_LIST = [
     'op_constructor',
diff --git a/settings/cpprefjp_relative.py b/settings/cpprefjp_relative.py
deleted file mode 100644
index 1e655b6..0000000
--- a/settings/cpprefjp_relative.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from .cpprefjp import *  # NOQA
-
-OUTPUT_DIR = 'cpprefjp/cpprefjp.relative'
-GOOGLE_ANALYTICS = ''
-USE_RELATIVE_LINK = True