From patchwork Wed Aug 29 01:42:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Kosnik X-Patchwork-Id: 180608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A40912C0096 for ; Wed, 29 Aug 2012 11:42:29 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1346809350; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Subject:Message-ID:Mime-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=gIgLzVrpVzcI5Lrk+OCG r9X0wNo=; b=KobrnwF3q/6nk9E9n8mehYO4DCxvIyU9+TDkn6iu8MA8uEgv0MVp 6I8+poKqLXcip/a0EXsQkdwwjZkaabkXh0REyOVnzk75PFueHMVGQuBKY/0TSdUW 2ixlJ7sGHtrKnW1+uOAHEeBITLijFHLY8vKJ8Ibl5V4f6caqBNdoeTs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Subject:Message-ID:Mime-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=HN8SyT9e+YjUXjV8zG5IOOAfNB3NFZgeMXJIkBR2w4aL8OBV0U51yz1FjpzStv VEMAbsTU9NGO7wsGL9WikXfcrgo7z0LlI5Pb8jBsDM08oc0kYnujihYFRJuBCm8q E3G8vaTBChyJW33vHYA6bmY541Cu2ikIBakMqDmnxSDvE=; Received: (qmail 32526 invoked by alias); 29 Aug 2012 01:42:22 -0000 Received: (qmail 32509 invoked by uid 22791); 29 Aug 2012 01:42:20 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, KAM_MX3, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_LW, URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 29 Aug 2012 01:42:03 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7T1g3YT008657 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 28 Aug 2012 21:42:03 -0400 Received: from coso (ovpn-113-143.phx2.redhat.com [10.3.113.143]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7T1g28h029075; Tue, 28 Aug 2012 21:42:03 -0400 Date: Tue, 28 Aug 2012 18:42:01 -0700 From: Benjamin De Kosnik To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [v3] libstdc++/54102 Message-ID: <20120828184201.647fb500@coso> Mime-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org ... finally got around to fixing up the generated HTML, so that charset is set to UTF-8. Sorry this took so long. tested x86/linux -benjamin diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 3853472..5c86bb9 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -432,6 +432,7 @@ dnl AC_OUTPUT macro. This one lists the files to be created: AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) AC_CONFIG_FILES([scripts/extract_symvers],[chmod +x scripts/extract_symvers]) +AC_CONFIG_FILES([doc/xsl/customization.xsl]) # Multilibs need MULTISUBDIR defined correctly in certain makefiles so # that multilib installs will end up installed in the correct place. diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 95d8513..b787200 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -465,9 +465,10 @@ XSLT_PARAM = --param toc.section.depth 4 #XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns #XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl -XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl -XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl +XSL_HTML_STYLE = $(XSL_STYLE_DIR)/html/chunk.xsl +XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/html/docbook.xsl XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl +XSL_LOCAL_STYLE = ${glibcxx_builddir}/doc/xsl/customization.xsl ${docbook_outdir}/epub: mkdir -p ${docbook_outdir}/epub @@ -529,21 +530,25 @@ stamp-html-docbook-lwg: stamp-html-docbook $(xml_extra) stamp-html-docbook-data: stamp-html-docbook-images stamp-html-docbook-lwg $(STAMP) stamp-html-docbook-data -# HTML, index plus chapters +# HTML, "chunked" into index plus chapters as separate pages stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html @echo "Generating html files..." $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${docbook_outdir}/html/ \ - $(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml + --stringparam chunker.output.encoding UTF-8 \ + $(XSL_HTML_STYLE) \ + ${top_srcdir}/doc/xml/spine.xml $(STAMP) stamp-html-docbook doc-html-docbook: stamp-html-docbook-data # HTML, all one page +# NB: Have to generate customization XSL for UTF-8 output. manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html @echo "Generating html single file..." $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${manual_html} \ - $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml + ${XSL_LOCAL_STYLE} \ + ${top_srcdir}/doc/xml/spine.xml $(STAMP) stamp-html-single-docbook doc-html-single-docbook: stamp-html-single-docbook diff --git a/libstdc++-v3/doc/xsl/customization.xsl.in b/libstdc++-v3/doc/xsl/customization.xsl.in new file mode 100644 index 0000000..9db621c --- /dev/null +++ b/libstdc++-v3/doc/xsl/customization.xsl.in @@ -0,0 +1,16 @@ + + + + + + + +