Update a document generating script.

git-svn-id: svn+ssh://svn.osdn.net/svnroot/sawarabi-fonts/trunk@160 54a90f34-5e62-402c-8eae-46c47f0b2e07

diff --git a/html/bin/gen.py b/html/bin/gen.py
index c2f42cd..c175e0a 100644 (file)
--- a/html/bin/gen.py
+++ b/html/bin/gen.py
@@ -106,27 +106,25 @@ def parse_args():
 
 if __name__ == "__main__":
     args = parse_args()
-    print(args.source)
-    print(args.out_path)
-    print(args.template_path)
 
     with open(args.source) as f:
         lines = f.readlines()
     doc = Parser(Section, rules).parse(lines)
 
-    print(doc)
-
     temp = html.parse(args.template_path)
     temp.getroot().attrib['lang'] = doc.property['lang']
     temp.xpath('//title')[0].text = doc.property['title']
     img = temp.xpath('//div[contains(@class, "logo")]/img')[0]
-    img.attrib['src'] = f"/img/logo-{doc.property['lang']}"
     img.attrib['alt'] = doc.property['title']
+    langname = temp.xpath('//div[contains(@id, "current-lang")]/span')[0]
+    langname.text = doc.property['language']
 
     for sec in temp.xpath('//section'):
         id = sec.attrib['id']
         fg = html.fromstring(doc[id])
         sec.append(fg)
 
+    for a in temp.xpath('//a'): a.attrib['target'] = '_blank'
+
     with open(args.out_path, 'w') as f:
         f.write(html.tostring(temp, encoding='utf-8').decode())

diff --git a/html/css/style.css b/html/css/style.css
index 5c9cc34..6965e4e 100644 (file)
--- a/html/css/style.css
+++ b/html/css/style.css
@@ -25,7 +25,7 @@ nav .container div#navbar div#lang div.container {
 }
 nav .container div#navbar div#lang div.item {
   padding: 26px 1em 0 1em;
-  width: 80px;
+  width: 85px;
   height: 40px;
   cursor: pointer;
   background-color: #fff;
@@ -69,7 +69,7 @@ header .container .buttons-container .button {
 header .container .buttons-container .pressed {
   background-color: #c8c8c8;
 }
-article .container {
+#docs .container {
   width: 650px;
   margin: 0 auto;
   padding: 10px 15px;

diff --git a/html/en.txt b/html/en.txt
index d1d1997..e92c65e 100644 (file)
--- a/html/en.txt
+++ b/html/en.txt
@@ -13,7 +13,7 @@ Ming typeface and is used like a serif font in Japan.
 Sawarabi Gothic and Mincho are normal ordinary fonts and have not notable
 features. But it can be said that their design concept might be a little
 traditional (or old fashioned), if compared with
-[VL Gothic](http://dicey.org/vlgothic/) (or [M+ FONTS](https://mplus-fonts.osdn.jp/))
+[VL Gothic](http://dicey.org/vlgothic/) and [M+ FONTS](https://mplus-fonts.osdn.jp/)
 which have already been popular as free Japanese fonts.
 
 Though both of fonts are available, they have not yet enough characters for
@@ -44,7 +44,7 @@ Sawarabi Mincho (ver.20140815).
 You can download the latest Sawarabi Fonts from the following links:
 
 <div id="download-box">
-<script charset="utf-8" type="text/javascript" src="https://osdn.net/projects/sawarabi-fonts/files/compact.js"></script>
+<script src="https://osdn.net/projects/sawarabi-fonts/files/compact.js"></script>
 <noscript>
 <p style="border: 1px solid black">
 (The download links cannot be shown because your browser disable JavaScript.

diff --git a/html/ja.txt b/html/ja.txt
index aa1ac79..e01fe96 100644 (file)
--- a/html/ja.txt
+++ b/html/ja.txt
@@ -40,7 +40,7 @@
 ゴシックが sawarabi-gothic、さわらび明朝が sawarabi-mincho に対応しています。
 
 <div id="download-box">
-<script charset="utf-8" type="text/javascript" src="https://osdn.net/projects/sawarabi-fonts/files/compact.js"></script>
+<script src="https://osdn.net/projects/sawarabi-fonts/files/compact.js"></script>
 <noscript>
 <p style="border: 1px solid black">　（JavaScript が有効になっていない場合は、
 ここにリンクは現れません。

diff --git a/html/template.html b/html/template.html
index 4889495..742b1a1 100644 (file)
--- a/html/template.html
+++ b/html/template.html
@@ -4,19 +4,43 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title></title>
     <link rel="stylesheet" href="css/style.css" type="text/css" />
-    <script src="js/mobile.js" type="text/javascript"></script>
-    <script src="js/jquery-2.1.0.min.js" type="text/javascript"></script>
-    <script src="js/lang.js" type="text/javascript"></script>
-    <script src="js/doc-header/ja.js" type="text/javascript"></script>
-    <script src="js/doc-header.js" type="text/javascript"></script>
+    <script src="js/mobile.js"></script>
+    <script src="js/jquery-2.1.0.min.js"></script>
+    <script src="js/lang.js"></script>
+    <script src="js/doc-header/ja.js"></script>
+    <script src="js/doc-header.js"></script>
   </head>
   <body>
     <nav>
       <div class="container">
        <div id="navbar">
-         <div class="logo"><img src="img/logo-en.png" alt="Sawarabi Fonts" /></div>
+         <div class="logo">
+           <img src="img/logo-ja.png" alt="Sawarabi Fonts" />
+         </div>
          <div id="lang">
-           <div id="current-lang" class="item" title="Select your language">English</div>
+           <div id="current-lang" class="item" title="Select your language">
+             <svg xmlns="http://www.w3.org/2000/svg"
+                  version="1.1"
+                  width="21"
+                  height="21"
+                  style="position:relative; top:.25em;">
+               <circle cx="10.5" cy="10.5" r="9.45"
+                       fill="none" stroke="black" stroke-width="1" />
+               <line x1="10.5" y1="1.05" x2="10.5" y2="19.95"
+                     stroke="black" stroke-width="1" />
+               <line x1="1.05" y1="10.5" x2="19.95" y2="10.5"
+                     stroke="black" stroke-width="1" />
+               <path d="M3.78,3.78 C6.3,7.98 14.7,7.98 17.22,3.78"
+                     fill="none" stroke="black" stroke-width="1" />
+               <path d="M3.78,17.22 C6.3,13.02 14.7,13.02 17.22,17.22"
+                     fill="none" stroke="black" stroke-width="1" />
+               <path d="M10.5,1.05 C3.78,3.15 3.78,17.85 10.5,19.95"
+                     fill="none" stroke="black" stroke-width="1" />
+               <path d="M10.5,1.05 C17.22,3.15 17.22,17.85 10.5,19.95"
+                     fill="none" stroke="black" stroke-width="1" />
+             </svg>
+             <span>English</span>
+           </div>
            <div id="lang-menu-container" class="container">
            </div>
          </div>
@@ -27,12 +51,15 @@
 
     <header>
       <div class="container">
-       <div class="buttons-container"><div class="inner-container"></div></div>
+       <div class="buttons-container">
+         <div class="inner-container">
+         </div>
+       </div>
        <canvas id="header-canvas" width="680" height="300"></canvas>
       </div>
     </header>
 
-    <article id="docs">
+    <div id="docs">
       <div class="container">
 
        <section id="about">
@@ -50,7 +77,7 @@
        <section id="links">
        </section>
       </div>
-    </article>
+    </div>
 
     <footer>
       <div class="container">