• R/O
  • SSH
  • HTTPS

lfsbookja: 提交


Commit MetaInfo

修訂1292 (tree)
時間2020-03-14 11:10:59
作者matsuand

Log Message

[LFS-SVN] txt版文字化け不備対応。その他。

Change Summary

差異

--- trunk/lfsbook/configure (revision 1291)
+++ trunk/lfsbook/configure (revision 1292)
@@ -4034,7 +4034,7 @@
40344034
40354035
40364036
4037-TARGETVER=svn-20200216
4037+TARGETVER=svn-20200302
40384038
40394039 SVNVER=`grep 'ENTITY version ' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
40404040 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5
--- trunk/lfsbook/src/Makefile.am (revision 1291)
+++ trunk/lfsbook/src/Makefile.am (revision 1292)
@@ -122,8 +122,9 @@
122122 @TXT@ make $(BASEDIR)/wget-list $(BASEDIR)/md5sums
123123
124124 @TXT@txt: nochunks
125-@TXT@ $(LYNX) -width=44 -dump $(BASEDIR)/$(NOCHUNKS_OUTPUT) > ../$(NOCHUNKS_NAME).txt
126-@TXT@ sed -i -E "s@file\:///[A-Za-z/\-]+\.html@$(URLTOP)/$(NOCHUNKS_NAME)-nochunks.html@g" ../$(NOCHUNKS_NAME).txt
125+@TXT@ $(LYNX) -assume_charset=utf-8 -display_charset=utf-8 -width=44 -dump $(BASEDIR)/$(NOCHUNKS_OUTPUT) > ../$(NOCHUNKS_NAME).txt
126+@TXT@ sed -i -e "s@file\:///[A-Za-z/\-]+\.html@$(URLTOP)/$(NOCHUNKS_NAME)-nochunks.html@g" \
127+@TXT@ -e "s@file\://$(abs_top_builddir)@$(URLTOP)@g" ../$(NOCHUNKS_NAME).txt
127128
128129 @PDF@@TAKAO@pdf: validate userconfig.xml
129130 @PDF@@TAKAO@ @echo "Generating profiled XML for PDF..."
--- trunk/lfsbook/src/Makefile.in (revision 1291)
+++ trunk/lfsbook/src/Makefile.in (revision 1292)
@@ -691,9 +691,12 @@
691691
692692 @TXT@nochunks: validate profile-html
693693 @TXT@ @echo "Generating non chunked XHTML file..."
694-@TXT@ $(XSLTPROC) --nonet -stringparam rootid "$(ROOT_ID)" \
695-@TXT@ --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
696-@TXT@ stylesheets/lfs-nochunks.xsl $(RENDERTMP)/lfs-html.xml
694+@TXT@ $(XSLTPROC) --nonet \
695+@TXT@ -stringparam rootid "$(ROOT_ID)" \
696+@TXT@ --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
697+@TXT@ stylesheets/lfs-nochunks.xsl \
698+@TXT@ $(RENDERTMP)/lfs-full.xml
699+@TXT@# $(RENDERTMP)/lfs-html2.xml
697700
698701 @TXT@ @echo "Running Tidy..."
699702 @TXT@ $(TIDY) -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@@ -705,8 +708,9 @@
705708 @TXT@ make $(BASEDIR)/wget-list $(BASEDIR)/md5sums
706709
707710 @TXT@txt: nochunks
708-@TXT@ $(LYNX) -width=44 -dump $(BASEDIR)/$(NOCHUNKS_OUTPUT) > ../$(NOCHUNKS_NAME).txt
709-@TXT@ sed -i -E "s@file\:///[A-Za-z/\-]+\.html@$(URLTOP)/$(NOCHUNKS_NAME)-nochunks.html@g" ../$(NOCHUNKS_NAME).txt
711+@TXT@ $(LYNX) -assume_charset=utf-8 -display_charset=utf-8 -width=44 -dump $(BASEDIR)/$(NOCHUNKS_OUTPUT) > ../$(NOCHUNKS_NAME).txt
712+@TXT@ sed -i -e "s@file\:///[A-Za-z/\-]+\.html@$(URLTOP)/$(NOCHUNKS_NAME)-nochunks.html@g" \
713+@TXT@ -e "s@file\://$(abs_top_builddir)@$(URLTOP)@g" ../$(NOCHUNKS_NAME).txt
710714
711715 @PDF@@TAKAO@pdf: validate userconfig.xml
712716 @PDF@@TAKAO@ @echo "Generating profiled XML for PDF..."
--- trunk/lfsbook/src/appendices/dependencies.ch (revision 1291)
+++ trunk/lfsbook/src/appendices/dependencies.ch (revision 1292)
@@ -437,6 +437,11 @@
437437 <seg>なし</seg>
438438 @z
439439 @x
440+ <seg>Python and XML::Parser</seg>
441+@y
442+ <seg>Python, XML::Parser</seg>
443+@z
444+@x
440445 <seg>None</seg>
441446 @y
442447 <seg>なし</seg>
@@ -1468,10 +1473,10 @@
14681473 <!-- Begin Python dependency info -->
14691474 @z
14701475 @x
1471- <seg>Bash, Binutils, Coreutils, GCC, Gdbm, Gettext, Glibc, Grep,
1476+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep,
14721477 Libffi, Make, Ncurses, and Sed</seg>
14731478 @y
1474- <seg>Bash, Binutils, Coreutils, GCC, Gdbm, Gettext, Glibc, Grep,
1479+ <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc, Grep,
14751480 Libffi, Make, Ncurses, Sed</seg>
14761481 @z
14771482 @x
Show on old repository browser