From 8d24c9756597c337feb94cf9401fe0f9d2780616 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 29 Aug 2012 01:37:16 +0000 Subject: [PATCH] re PR libstdc++/54102 (generated html vs. utf8) 2012-08-28 Benjamin Kosnik PR libstdc++/54102 * doc/xsl/customization.xsl.in: New. * configure.ac: Output local copy of customization xsl. * doc/Makefile.am (stamp-html-single-docbook): Use XSL_LOCAL_STYLE. (stamp-html-docbook): Set stringparam to UTF-8. * Makefile.in: Regenerated. * configure: Same. * doc/Makefile.in: Same. From-SVN: r190768 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/Makefile.in | 8 ++++++-- libstdc++-v3/configure | 3 +++ libstdc++-v3/configure.ac | 1 + libstdc++-v3/doc/Makefile.am | 15 ++++++++++----- libstdc++-v3/doc/Makefile.in | 15 ++++++++++----- libstdc++-v3/doc/xsl/customization.xsl.in | 16 ++++++++++++++++ 7 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 libstdc++-v3/doc/xsl/customization.xsl.in diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c2fcddc3bda..c92bbb37339 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2012-08-28 Benjamin Kosnik + + PR libstdc++/54102 + * doc/xsl/customization.xsl.in: New. + * configure.ac: Output local copy of customization xsl. + * doc/Makefile.am (stamp-html-single-docbook): Use XSL_LOCAL_STYLE. + (stamp-html-docbook): Set stringparam to UTF-8. + * Makefile.in: Regenerated. + * configure: Same. + * doc/Makefile.in: Same. + 2012-08-27 Ulrich Drepper Add interfaces to retrieve random numbers in bulk. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 6a66c60a651..5089d0a63d9 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am README ChangeLog \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ $(top_srcdir)/scripts/testsuite_flags.in \ - $(top_srcdir)/scripts/extract_symvers.in + $(top_srcdir)/scripts/extract_symvers.in \ + $(top_srcdir)/doc/xsl/customization.xsl.in subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -67,7 +68,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = scripts/testsuite_flags scripts/extract_symvers +CONFIG_CLEAN_FILES = scripts/testsuite_flags scripts/extract_symvers \ + doc/xsl/customization.xsl CONFIG_CLEAN_VPATH_FILES = depcomp = am__depfiles_maybe = @@ -434,6 +436,8 @@ scripts/testsuite_flags: $(top_builddir)/config.status $(top_srcdir)/scripts/tes cd $(top_builddir) && $(SHELL) ./config.status $@ scripts/extract_symvers: $(top_builddir)/config.status $(top_srcdir)/scripts/extract_symvers.in cd $(top_builddir) && $(SHELL) ./config.status $@ +doc/xsl/customization.xsl: $(top_builddir)/config.status $(top_srcdir)/doc/xsl/customization.xsl.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 2da417e1458..9ea8042a1ca 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -71893,6 +71893,8 @@ ac_config_files="$ac_config_files scripts/testsuite_flags" ac_config_files="$ac_config_files scripts/extract_symvers" +ac_config_files="$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. @@ -73104,6 +73106,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "scripts/testsuite_flags") CONFIG_FILES="$CONFIG_FILES scripts/testsuite_flags" ;; "scripts/extract_symvers") CONFIG_FILES="$CONFIG_FILES scripts/extract_symvers" ;; + "doc/xsl/customization.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/customization.xsl" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "libsupc++/Makefile") CONFIG_FILES="$CONFIG_FILES libsupc++/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 38534728815..5c86bb97589 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 95d8513ad46..b787200c5b8 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/Makefile.in b/libstdc++-v3/doc/Makefile.in index fe6ac634716..40272ef03a7 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -517,9 +517,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 LINT_FLAGS = --debug --xinclude --noent --noblanks --noout SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd @@ -533,6 +534,7 @@ manual_xml = ${docbook_outdir}/xml/libstdc++-manual.xml set_xml = ${docbook_outdir}/xml/libstdc++-set.xml # HTML, all one page +# NB: Have to generate customization XSL for UTF-8 output. manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html # PDF, via dblatex @@ -917,18 +919,21 @@ 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 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 00000000000..9db621ce73a --- /dev/null +++ b/libstdc++-v3/doc/xsl/customization.xsl.in @@ -0,0 +1,16 @@ + + + + + + + +