Received: from mail-gx0-f189.google.com ([209.85.161.189]:47445) by stodi.digitalkingdom.org with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) (envelope-from ) id 1SBdAr-0002N1-B2; Sat, 24 Mar 2012 19:27:32 -0700 Received: by ggmi2 with SMTP id i2sf5540594ggm.16 for ; Sat, 24 Mar 2012 19:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:from:date:to:subject:user-agent :mime-version:message-id:x-spam-score:x-spam_score:x-spam_score_int :x-spam_bar:sender:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe:content-type :content-transfer-encoding; bh=2hWQA6Yti6j7oOlwhixabDEDk0SH0SMvA3tku2x+Ti4=; b=2ikv0nqMb15ikPJdHEtipgr5FCwQVP6bgx0z+XuLcbCFJctk4Yw7bWtywaSX9brJnD iKC1z7XXqTXNuDkY1mk2trucpNLktVJ1NIYdCOlY0zClAF25+tNzG5wmOy8KGhHC6i7k L42ffFC4IBY6Yj52W9V5bJHWsCO/RUc2ZJedc= Received: by 10.50.36.200 with SMTP id s8mr848116igj.5.1332642421655; Sat, 24 Mar 2012 19:27:01 -0700 (PDT) X-BeenThere: bpfk-list@googlegroups.com Received: by 10.231.76.27 with SMTP id a27ls6422691ibk.4.gmail; Sat, 24 Mar 2012 19:27:01 -0700 (PDT) Received: by 10.50.12.169 with SMTP id z9mr2088570igb.5.1332642421214; Sat, 24 Mar 2012 19:27:01 -0700 (PDT) Received: by 10.50.151.242 with SMTP id ut18msigb; Sat, 24 Mar 2012 18:21:15 -0700 (PDT) Received: by 10.68.129.169 with SMTP id nx9mr15325892pbb.2.1332638475667; Sat, 24 Mar 2012 18:21:15 -0700 (PDT) Received: by 10.68.129.169 with SMTP id nx9mr15325890pbb.2.1332638475652; Sat, 24 Mar 2012 18:21:15 -0700 (PDT) Received: from stodi.digitalkingdom.org (mail.digitalkingdom.org. [173.13.139.236]) by gmr-mx.google.com with ESMTPS id 6si12235144pbg.2.2012.03.24.18.21.15 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Mar 2012 18:21:15 -0700 (PDT) Received-SPF: pass (google.com: domain of nobody@stodi.digitalkingdom.org designates 173.13.139.236 as permitted sender) client-ip=173.13.139.236; Received: from nobody by stodi.digitalkingdom.org with local (Exim 4.76) (envelope-from ) id 1SBc8v-0002AE-Cl for bpfk-list@googlegroups.com; Sat, 24 Mar 2012 18:21:13 -0700 Received: from 173-13-139-235-sfba.hfc.comcastbusiness.net ([173.13.139.235]:36451 helo=digitalkingdom.org) by stodi.digitalkingdom.org with smtp (Exim 4.76) (envelope-from ) id 1SBc8m-0002A6-PT for bpfk@lojban.org; Sat, 24 Mar 2012 18:21:13 -0700 Received: by digitalkingdom.org (sSMTP sendmail emulation); Sat, 24 Mar 2012 18:21:04 -0700 From: "Apache" Date: Sat, 24 Mar 2012 18:21:04 -0700 To: bpfk@lojban.org Subject: [bpfk] dag-cll git updates for Sat Mar 24 18:21:04 PDT 2012 User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: X-Spam-Score: 1.0 (+) X-Spam_score: 1.0 X-Spam_score_int: 10 X-Spam_bar: + Sender: bpfk-list@googlegroups.com X-Original-Sender: nobody@stodi.digitalkingdom.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of nobody@stodi.digitalkingdom.org designates 173.13.139.236 as permitted sender) smtp.mail=nobody@stodi.digitalkingdom.org Reply-To: bpfk-list@googlegroups.com Precedence: list Mailing-list: list bpfk-list@googlegroups.com; contact bpfk-list+owners@googlegroups.com List-ID: X-Google-Group-Id: 972099695765 List-Post: , List-Help: , List-Archive: List-Subscribe: , List-Unsubscribe: , Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Spam_score: -0.0 X-Spam_score_int: 0 X-Spam_bar: / commit f043bcd54d751be372dcc8a402fe8c810234fbb2 Author: Robin Lee Powell Date: Sat Mar 24 17:23:13 2012 -0700 Got the sections and chapters working. diff --git a/Makefile b/Makefile index 9f5bd27..c378df5 100644 --- a/Makefile +++ b/Makefile @@ -28,21 +28,21 @@ cll_processed_xhtml.xml: cll.xml xml/docbook2html_prepr= ocess.xsl #******* # Many xhtml files #******* .PHONY: xhtml_web xhtml_web: xhtml.done mkdir -p ~/www/media/public/tmp rm -rf ~/www/media/public/tmp/cll-xhtml cp -pr xhtml ~/www/media/public/tmp/cll-xhtml cp $(PWD)/docbook2html.css ~/www/media/public/tmp/cll-xhtml/docbook2html= .css mkdir -p ~/www/media/public/tmp/cll-xhtml/media - cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/me= dia/chapter-2-diagram.png + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/ch= apter-2-diagram.png =20 .PHONY: xhtml xhtml: xhtml.done xhtml.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml mkdir xhtml # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config_no-sections.xsl -o xhtml/ xhtml cll_proc= essed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Usi= ng default "en".' touch xhtml.done @@ -50,41 +50,41 @@ xhtml.done: cll_processed_xhtml.xml xml/docbook2html_co= nfig.xsl #******* # Section xhtml files #******* .PHONY: xhtml_sections_web xhtml_sections_web: xhtml_sections.done mkdir -p ~/www/media/public/tmp rm -rf ~/www/media/public/tmp/cll-xhtml-sections cp -pr xhtml_sections ~/www/media/public/tmp/cll-xhtml-sections cp $(PWD)/docbook2html.css ~/www/media/public/tmp/cll-xhtml-sections/doc= book2html.css mkdir -p ~/www/media/public/tmp/cll-xhtml-sections/media - cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/se= ctions/media/chapter-2-diagram.png + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml-se= ctions/chapter-2-diagram.png =20 .PHONY: xhtml_sections xhtml_sections: xhtml_sections.done xhtml_sections.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml_sections mkdir xhtml_sections # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config_sections.xsl -o xhtml_sections/ --string= param chunk.section.depth=3D1 --stringparam chunk.first.sections=3D1 xhtml = cll_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or= "". Using default "en".' touch xhtml_sections.done =20 #******* # One XHTML file #******* .PHONY: xhtml_nochunks_web xhtml_nochunks_web: xhtml-nochunks.done mkdir -p ~/www/media/public/tmp/media cp $(PWD)/docbook2html.css ~/www/media/public/tmp/docbook2html.css cp $(PWD)/xhtml-nochunks/cll_processed_xhtml.html ~/www/media/public/tmp/= cll-xhtml-nochunks.html - cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/media/chapte= r-2-diagram.png + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/chapter-2-di= agram.png =20 .PHONY: xhtml_nochunks xhtml_nochunks: xhtml-nochunks.done xhtml-nochunks.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml-nochunks mkdir xhtml-nochunks ln -fs $(PWD)/docbook2html.css xhtml-nochunks/ # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config.xsl -o xhtml-nochunks/ xhtml-nochunks cl= l_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "= ". Using default "en".' diff --git a/xml/docbook2html_config_no-sections.xsl b/xml/docbook2html_con= fig_no-sections.xsl index 74e3954..88bdce5 100644 --- a/xml/docbook2html_config_no-sections.xsl +++ b/xml/docbook2html_config_no-sections.xsl @@ -1,13 +1,18 @@ =20 - + + + appendix toc,title article/appendix nop article toc,title book toc,title,figure,table,equation chapter title part toc,title preface toc,title qandadiv toc qandaset toc diff --git a/xml/docbook2html_config_sections.xsl b/xml/docbook2html_config= _sections.xsl index 2023f08..73fedbd 100644 --- a/xml/docbook2html_config_sections.xsl +++ b/xml/docbook2html_config_sections.xsl @@ -1,13 +1,19 @@ =20 - + + + + appendix toc,title article/appendix nop article toc,title book toc,title,figure,table,equation chapter toc,title part toc,title preface toc,title qandadiv toc qandaset toc commit cdc76c1280849a9a166e34e2e143d42f6887d1ce Merge: e2dc9a8 c0244d8 Author: Robin Lee Powell Date: Sat Mar 24 17:22:58 2012 -0700 Merge remote-tracking branch 'banseljaj/docbook' into docbook =20 Conflicts: Makefile commit c0244d80773c80cda89ef8f18632b6ca2fc198c7 Author: Ali Sajid Imami Date: Thu Mar 22 04:35:50 2012 -0700 minor cleanup diff --git a/Makefile b/Makefile index e319a09..73c5c28 100644 --- a/Makefile +++ b/Makefile @@ -35,21 +35,21 @@ xhtml_web: xhtml.done cp -pr xhtml ~/www/media/public/tmp/cll-xhtml cp $(PWD)/docbook2html.css ~/www/media/public/tmp/cll-xhtml/docbook2html= .css =20 .PHONY: xhtml xhtml: xhtml.done xhtml.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml mkdir xhtml # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting - xmlto -m xml/docbook2html_config.xsl -o xhtml/ xhtml cll_processed_xhtml.= xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Using default "= en".' + xmlto -m xml/docbook2html_config_no-sections.xsl -o xhtml/ xhtml cll_proc= essed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Usi= ng default "en".' touch xhtml.done =20 #******* # Section xhtml files #******* .PHONY: xhtml_sections_web xhtml_sections_web: xhtml_sections.done mkdir -p ~/www/media/public/tmp rm -rf ~/www/media/public/tmp/cll-xhtml-sections cp -pr xhtml_sections ~/www/media/public/tmp/cll-xhtml-sections commit fa8b5a3d3e950d20898b541cd7915bb66ec8bcf9 Author: Ali Sajid Imami Date: Thu Mar 22 03:09:33 2012 -0700 minor cleanup diff --git a/xhtml_chapters.done b/xhtml_chapters.done deleted file mode 100644 index e69de29..0000000 commit c5163a2eb12e6450fc2236d709dc3afd187f8114 Author: Ali Sajid Imami Date: Thu Mar 22 14:58:38 2012 +0500 Split the xsl files into common and section specofic diff --git a/.gitignore b/.gitignore index ccb70c8..923fcae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,18 @@ .*.sw[po] cll.xml cll_preglossary.xml xhtml/ xhtml.done jbovlaste.xml jbovlaste2.xml xhtml-nochunks/ xhtml-nochunks.done +xhtml_chapters.done cll.epub cll.mobi cll.pdf cll_processed_pdf.xml cll_processed_xhtml.xml xhtml_sections.done xhtml_sections/ +*.*~ diff --git a/xml/docbook2html_config_common.xsl b/xml/docbook2html_config_c= ommon.xsl new file mode 100644 index 0000000..7c1ea1c --- /dev/null +++ b/xml/docbook2html_config_common.xsl @@ -0,0 +1,45 @@ + + + + + + + + + + =20 + + + + + + + + + + + + + 100% + + + + + + + + + + + + + diff --git a/xml/docbook2html_config_no-sections.xsl b/xml/docbook2html_con= fig_no-sections.xsl new file mode 100644 index 0000000..74e3954 --- /dev/null +++ b/xml/docbook2html_config_no-sections.xsl @@ -0,0 +1,24 @@ + + + + + appendix toc,title + article/appendix nop + article toc,title + book toc,title,figure,table,equation + chapter title + part toc,title + preface toc,title + qandadiv toc + qandaset toc + reference toc,title + sect1 toc + sect2 toc + sect3 toc + sect4 toc + sect5 toc + section toc + set toc,title + + + diff --git a/xml/docbook2html_config_sections.xsl b/xml/docbook2html_config= _sections.xsl index 185a5f6..2023f08 100644 --- a/xml/docbook2html_config_sections.xsl +++ b/xml/docbook2html_config_sections.xsl @@ -1,67 +1,24 @@ - - - - - - - - - + + appendix toc,title article/appendix nop article toc,title book toc,title,figure,table,equation chapter toc,title part toc,title preface toc,title qandadiv toc qandaset toc reference toc,title sect1 toc sect2 toc sect3 toc sect4 toc sect5 toc section toc set toc,title =20 - - - - - - - - - - - - - 100% - - - - - - - - - - - - commit 8a009572b13d060bd86f982a9ca057a612fea9b2 Author: Ali Sajid Imami Date: Sun Mar 18 01:19:51 2012 -0700 Makefile modified diff --git a/Makefile b/Makefile index c3c24ac..e319a09 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ test =3D=20 chapters =3D $(if $(CHAPTERS), $(CHAPTERS), chapters/1.xml chapters/2.xml = chapters/3.xml chapters/4.xml chapters/5.xml chapters/6.xml chapters/7.xml = chapters/8.xml chapters/9.xml chapters/10.xml chapters/11.xml chapters/12.x= ml chapters/13.xml chapters/14.xml chapters/15.xml chapters/16.xml chapters= /17.xml chapters/18.xml chapters/19.xml chapters/20.xml chapters/21.xml) =20 .PHONY: all -all: xhtml_web xhtml_nochunks_web pdf_web epub_web mobi_web +all: xhtml_web xhtml_nochunks_web pdf_web epub_web mobi_web xhtml_sections= _web =20 .PHONY: clean clean: -rm -rf cll* xhtml/ xhtml.done xhtml-nochunks/ xhtml-nochunks.done =20 .PHONY: realclean realclean: clean -rm -rf jbovlaste.xml jbovlaste2.xml =20 #******* diff --git a/xhtml_chapters.done b/xhtml_chapters.done new file mode 100644 index 0000000..e69de29 --=20 You received this message because you are subscribed to the Google Groups "= BPFK" group. To post to this group, send email to bpfk-list@googlegroups.com. To unsubscribe from this group, send email to bpfk-list+unsubscribe@googleg= roups.com. For more options, visit this group at http://groups.google.com/group/bpfk-l= ist?hl=3Den.