[debiandoc-sgml-devel] Committed first patch
Osamu Aoki
osamu@debian.org
Sun, 13 Feb 2005 21:50:02 +0100
--cNdxnHkX5QqsyA0e
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Other than the template related changes I reported as the diff of
generated files, here are the changes I am making to accomodate this
reorganization.
Hmmm. I found bug. script.diff --> scripts.diff
FYI:
--cNdxnHkX5QqsyA0e
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="osamu.diff"
diff -Nru debiandoc-sgml-1.1.87/debian/README.Debian debiandoc-sgml-1.1.8.0osamu/debian/README.Debian
--- debiandoc-sgml-1.1.87/debian/README.Debian 2004-01-02 23:02:26.000000000 +0100
+++ debiandoc-sgml-1.1.8.0osamu/debian/README.Debian 2005-02-13 16:23:06.000000000 +0100
@@ -12,11 +12,12 @@
- plain text
- overstrike text
- LaTeX
- - DVI (via LaTex)
- - PDF (via DVI)
+ - DVI (via LaTeX)
+ - PDF (via pdfLaTeX)
- PS (via DVI)
- Texinfo
- Info (via Texinfo)
+ - Docbook XML (via Texinfo)
The documentation for the DTD (and in the future also for the tools)
can be found in the 'debiandoc-sgml-doc' package. The documentation
diff -Nru debiandoc-sgml-1.1.87/debian/rules debiandoc-sgml-1.1.8.0osamu/debian/rules
--- debiandoc-sgml-1.1.87/debian/rules 2003-08-12 02:38:01.000000000 +0200
+++ debiandoc-sgml-1.1.8.0osamu/debian/rules 2005-02-13 20:30:37.000000000 +0100
@@ -19,6 +19,7 @@
[ ! -f Makefile ] || $(MAKE) clean
dh_clean
rm -f build-stamp install-stamp
+ rm -f script.diff
build: build-stamp
build-stamp:
@@ -26,6 +27,9 @@
$(MAKE) prefix=/usr
touch build-stamp
+scripts.diff: build-stamp
+ $(MAKE) scripts.diff prefix=/usr
+
install: install-stamp
install-stamp: build
dh_testdir
diff -Nru debiandoc-sgml-1.1.87/debian/TODO debiandoc-sgml-1.1.8.0osamu/debian/TODO
--- debiandoc-sgml-1.1.87/debian/TODO 2005-02-13 17:04:21.000000000 +0100
+++ debiandoc-sgml-1.1.8.0osamu/debian/TODO 2005-02-13 19:58:05.000000000 +0100
@@ -30,25 +30,25 @@
VARIOUS
------------------------------------------------------------------------------
-SDBP Description
+SDBP Prior. Description
------------------------------------------------------------------------------
- x complete SDATA map for all supported locales and formats
- x fix compact lists in Texinfo (bug in Texinfo !!!)
- x make references consistent wtr their look and feel
- xx add format support for references
-?xx add <figure>, <lof>
-?xx add <index>, <loi>
-?xx add <table>,<lot>
-?xx manual page support
-x integrate template and all debiandoc2* scripts (in Perl)
-x maybe also use `papersize -Ns` in LaTeX
-x option in LaTeX to mark overflown text
-x relation paperconf and dvips, check for papersize, etc.
-x support long option names
-x x support HTML via LaTeX
-x x support HTML, DVI, PS and PDF via Texinfo
-x x support HTML, DVI, PS, PDF, Text and TextOV via groff
-x xx groff backend
-xxxx XML support
-xxxx add locale indicator (PI)
+ x +++++ complete SDATA map for all supported locales and formats
+ x ++++ fix compact lists in Texinfo (bug in Texinfo !!!)
+ x +++ make references consistent wtr their look and feel
+ xx ++ add format support for references
+?xx + add <figure>, <lof>
+?xx + <index>, <loi>
+?xx + <table>,<lot>
+?xx + manual page support
+x +++ maybe also use `papersize -Ns` in LaTeX
+x +++ option in LaTeX to mark overflown text
+x +++ relation paperconf and dvips, check for papersize, etc.
+x + support long option names
+x x +++++ consolidate and clean up input file handling routines in bin/template
+x x + support HTML via LaTeX
+x x + support HTML, DVI, PS and PDF via Texinfo
+x x + support HTML, DVI, PS, PDF, Text and TextOV via groff
+x xx + groff backend
+xxxx + diect XML support
+xxxx ? add locale indicator (PI)
------------------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.87/Makefile debiandoc-sgml-1.1.8.0osamu/Makefile
--- debiandoc-sgml-1.1.87/Makefile 2005-02-13 17:04:20.000000000 +0100
+++ debiandoc-sgml-1.1.8.0osamu/Makefile 2005-02-13 20:39:08.000000000 +0100
@@ -53,12 +53,11 @@
## ----------------------------------------------------------------------
## Package tools file definitions
FORMATS := HTML LaTeX Texinfo Text TextOV
-SPECS := html latex texinfo text textov
+SPECS := html latex texinfo text textov info latexdvi latexps latexpdf xml
EXTS := html tex texinfo txt tov
BCONVS := $(foreach spec,$(SPECS),$(dtd_name)2$(spec))
-PCONVS := $(dtd_name)2dvi $(dtd_name)2info $(dtd_name)2latexdvi \
- $(dtd_name)2latexpdf $(dtd_name)2latexps \
- $(dtd_name)2pdf $(dtd_name)2ps
+PSPECS := dvi ps pdf
+PCONVS := $(foreach spec,$(PSPECS),$(dtd_name)2$(spec))
TOOLS := $(BCONVS) $(PCONVS)
MAN1S := $(pkg_name)
HELPERS := saspconvert fixlatex
@@ -73,6 +72,7 @@
LN := /bin/ln -sf
RM := /bin/rm -f
RMDIR := /bin/rmdir -p --ignore-fail-on-non-empty
+DIFF := /usr//bin/diff -w -u
## ----------------------------------------------------------------------
## Targets
@@ -81,7 +81,7 @@
bin: $(foreach bconv,$(BCONVS),tools/bin/$(bconv))
$(foreach bconv,$(BCONVS),tools/bin/$(bconv)): \
- tools/bin/template tools/bin/conversions tools/bin/mkconversions
+ tools/bin/template tools/bin/mkconversions
set -e; \
cd tools/bin; \
@@ -142,10 +142,14 @@
set -e; \
$(INSTALL_DIR) $(bin_dir); \
- for f in $(TOOLS); \
+ for f in $(BCONVS); \
do \
$(INSTALL_SCRIPT) tools/bin/$$f $(bin_dir); \
done
+ for f in $(PSPECS); \
+ do \
+ $(LN) $(dtd_name)2latex$$f $(bin_dir)/$(dtd_name)2$$f; \
+ done
set -e; \
$(INSTALL_DIR) $(man1_dir); \
@@ -227,8 +231,22 @@
done; \
$(RMDIR) $(pkg_dtd_dir)
+diff: scripts.diff
+
+scripts.diff: $(foreach bconv,$(BCONVS),tools/bin/$(bconv))
+
+ :> scripts.diff
+ for f in $(BCONVS); \
+ do \
+ g=/usr/bin/$$f ;\
+ if [ -e "$$g" ] ; then \
+ $(DIFF) tools/bin/$$f $$g >> scripts.diff ;\
+ fi ;\
+ done
+
clean:
$(RM) $(foreach bconv,$(BCONVS),tools/bin/$(bconv))
+ rm -f scripts.diff
## ----------------------------------------------------------------------
diff -Nru debiandoc-sgml-1.1.87/tools/man/debiandoc-sgml.1 debiandoc-sgml-1.1.8.0osamu/tools/man/debiandoc-sgml.1
--- debiandoc-sgml-1.1.87/tools/man/debiandoc-sgml.1 2005-02-13 17:04:33.000000000 +0100
+++ debiandoc-sgml-1.1.8.0osamu/tools/man/debiandoc-sgml.1 2005-02-13 19:46:56.000000000 +0100
@@ -37,6 +37,10 @@
.I "[-v]"
.I "[shared options]"
.br
+.B debiandoc2xml
+.I "[-v]"
+.I "[shared options]"
+.br
.B debiandoc2latex
.I "[-O]"
.I "[shared options]"
@@ -116,6 +120,7 @@
.BR debiandoc2dvi ", "
.BR debiandoc2html ", "
.BR debiandoc2info ", "
+.BR debiandoc2xml ", "
.BR debiandoc2latexdvi ", "
.BR debiandoc2latexpdf ", "
.BR debiandoc2latexps ", "
@@ -142,6 +147,11 @@
.IB basename .info
via the Texinfo documentation system.
+.B debiandoc2xml
+produces an DocBook XML file
+.IB basename .xml
+via the Texinfo documentation system.
+
.B debiandoc2latex
produces an input file
.IB basename .tex
@@ -307,10 +317,12 @@
Put the comments in footnote style in the output.
.TP
.BI -s \ script
-Apply the specified script on the generated .tex file. The script is called
-with parameters
+Apply the specified script on the intermediate generated .tex / .texinfo file.
+The script is called with parameters
.I [ -l \ locale ] basename\fB.tex\fR.
This may be useful to support new features, to correct bogus hyphenations, ...
+(Currently, this hook is internally used to fix Chinese big5 encoding issues
+for LaTeX using fixlatex as the default script.)
.TP
.BI -p \ papersize
Produce output in the indicated
@@ -351,6 +363,7 @@
If
.B debiandoc2dvi\fR,
.B debiandoc2info\fR,
+.B debiandoc2xml\fR,
.B debiandoc2latexdvi\fR,
.B debiandoc2latexpdf\fR,
.B debiandoc2latexps\fR,
--cNdxnHkX5QqsyA0e--