changeset 1658:ae713f8acaca

Two Japanese books.
author Igor Sysoev <igor@sysoev.ru>
date Wed, 24 Feb 2016 15:42:57 +0000
parents b4428c8d1c21
children 680cbf783efe
files GNUmakefile dtd/content.dtd sources/51JYTdy8jrL._SX335_BO1,204,203,200_.jpg sources/9784774178660.jpg xml/en/books.xml xsls/books.xsls xslt/books.xslt
diffstat 7 files changed, 52 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Wed Feb 24 18:06:22 2016 +0300
+++ b/GNUmakefile	Wed Feb 24 15:42:57 2016 +0000
@@ -169,6 +169,8 @@
 	$(call XSLScript, $<, $@)
 
 images:									\
+		binary/books/practical_nginx_guide_jp.jpg		\
+		binary/books/nginx_pocket_reference_jp.jpg		\
 		binary/books/nginx_http_server_jp.jpg			\
 		binary/books/nginx_1_web_server.jpg			\
 		binary/books/nginx_http_server.jpg			\
@@ -180,6 +182,15 @@
 		binary/books/nginx_high_performance.jpg			\
 		binary/books/nginx_essentials.jpg
 
+binary/books/practical_nginx_guide_jp.jpg:	sources/9784774178660.jpg
+	mkdir -p $(dir $@)
+	$(call JPEGNORM, $<, $@)
+
+binary/books/nginx_pocket_reference_jp.jpg:				\
+		sources/51JYTdy8jrL._SX335_BO1,204,203,200_.jpg
+	mkdir -p $(dir $@)
+	$(call JPEGNORM, $<, $@)
+
 binary/books/nginx_http_server_jp.jpg:	sources/1106030720.jpg
 	mkdir -p $(dir $@)
 	$(call JPEGNORM, $<, $@)
--- a/dtd/content.dtd	Wed Feb 24 18:06:22 2016 +0300
+++ b/dtd/content.dtd	Wed Feb 24 15:42:57 2016 +0000
@@ -104,7 +104,9 @@
            title        CDATA #REQUIRED
            link         CDATA #REQUIRED
            author       CDATA #REQUIRED
-           site         CDATA #REQUIRED
+           author2      CDATA #IMPLIED
+           site         CDATA #IMPLIED
+           site2        CDATA #IMPLIED
            publisher    CDATA #REQUIRED
            lang         CDATA #REQUIRED
            cover        CDATA #REQUIRED
Binary file sources/51JYTdy8jrL._SX335_BO1,204,203,200_.jpg has changed
Binary file sources/9784774178660.jpg has changed
--- a/xml/en/books.xml	Wed Feb 24 18:06:22 2016 +0300
+++ b/xml/en/books.xml	Wed Feb 24 15:42:57 2016 +0000
@@ -13,7 +13,28 @@
 
 <section>
 
-    <book
+<book
+    title="nginx実践入門 (Practical nginx guide)"
+    link="http://gihyo.jp/magazine/wdpress/plus/978-4-7741-7866-0"
+    author="久保達彦(くぼたつひこ) (Tatsuhiko Kubo)"
+    site="http://cccis.jp"
+    author2="道井俊介(みちいしゅんすけ) (MICHII Shunsuke)"
+    site2="http://harukasan.jp"
+    publisher="技術評論社 (Gijutsuhyoronsha)"
+    lang="日本語 (Japanese)"
+    cover="../books/practical_nginx_guide_jp.jpg" />
+
+<book
+    title="Nginx ポケットリファレンス (Nginx pocket reference)"
+    link="http://www.amazon.co.jp/dp/4774176338"
+    author="鶴長 鎮一 (Shinichi Tsurunaga)"
+    author2="馬場 俊彰 (Baba Toshiaki)"
+    site2="http://netmark.jp"
+    publisher="技術評論社 (Gijutsuhyoronsha)"
+    lang="日本語 (Japanese)"
+    cover="../books/nginx_pocket_reference_jp.jpg" />
+
+<book
     title="Nginx Essentials"
     link="https://www.packtpub.com/networking-and-servers/nginx-essentials/book"
     author="Valery Kholodkov"
@@ -22,7 +43,7 @@
     lang="English"
     cover="../books/nginx_essentials.jpg" />
 
-    <book
+<book
     title="Nginx High Performance"
     link="https://www.packtpub.com/networking-and-servers/nginx-high-performance/book"
     author="Rahul Sharma"
--- a/xsls/books.xsls	Wed Feb 24 18:06:22 2016 +0300
+++ b/xsls/books.xsls	Wed Feb 24 15:42:57 2016 +0000
@@ -17,8 +17,14 @@
 
     <td>
     X:text {title: } <a href="{@link}">!{@title}</a> <br/>
-    X:text {author: }
-    X:if "@site" { <a href="{@site}">!{@author}</a> } else { !{@author} } <br/>
+    X:if "@author2" { X:text {authors: } } else { X:text {author: } }
+    X:if "@site" { <a href="{@site}">!{@author}</a> } else { !{@author} }
+    X:if "@author2" {
+        X:text {,} <br/> X:text {&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;}
+        X:if "@site2" { <a href="{@site2}">!{@author2}</a> }
+                 else { !{@author2} }
+    }
+    <br/>
     X:if "@translator" { X:text {translator: } !{@translator} <br/> }
     X:if "@publisher" { X:text {publisher: } !{@publisher} <br/> }
     X:text {language: } !{@lang}
--- a/xslt/books.xslt	Wed Feb 24 18:06:22 2016 +0300
+++ b/xslt/books.xslt	Wed Feb 24 15:42:57 2016 +0000
@@ -18,8 +18,13 @@
 
     <td>
     <xsl:text>title: </xsl:text> <a href="{@link}"><xsl:value-of select="@title"/></a> <br/>
-    <xsl:text>author: </xsl:text>
-    <xsl:choose><xsl:when test="@site"> <a href="{@site}"><xsl:value-of select="@author"/></a> </xsl:when><xsl:otherwise> <xsl:value-of select="@author"/> </xsl:otherwise></xsl:choose> <br/>
+    <xsl:choose><xsl:when test="@author2"> <xsl:text>authors: </xsl:text> </xsl:when><xsl:otherwise> <xsl:text>author: </xsl:text> </xsl:otherwise></xsl:choose>
+    <xsl:choose><xsl:when test="@site"> <a href="{@site}"><xsl:value-of select="@author"/></a> </xsl:when><xsl:otherwise> <xsl:value-of select="@author"/> </xsl:otherwise></xsl:choose>
+    <xsl:if test="@author2">
+        <xsl:text>,</xsl:text> <br/> <xsl:text>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;</xsl:text>
+        <xsl:choose><xsl:when test="@site2"> <a href="{@site2}"><xsl:value-of select="@author2"/></a> </xsl:when><xsl:otherwise> <xsl:value-of select="@author2"/> </xsl:otherwise></xsl:choose>
+    </xsl:if>
+    <br/>
     <xsl:if test="@translator"> <xsl:text>translator: </xsl:text> <xsl:value-of select="@translator"/> <br/> </xsl:if>
     <xsl:if test="@publisher"> <xsl:text>publisher: </xsl:text> <xsl:value-of select="@publisher"/> <br/> </xsl:if>
     <xsl:text>language: </xsl:text> <xsl:value-of select="@lang"/>