From jensseidel@users.sf.net  Sun Feb 13 00:52:50 2005
From: jensseidel@users.sf.net (Jens Seidel)
Date: Sun, 13 Feb 2005 01:52:50 +0100
Subject: [debiandoc-sgml-devel] Re: DebianDoc-SGML Alioth project up and running
In-Reply-To: <20050212014431.GA17267@aokiconsulting.com>
References: <20050211202703.GE328@sbcglobal.net> <20050212014431.GA17267@aokiconsulting.com>
Message-ID: <20050213005250.GA27860@pluto>

On Sat, Feb 12, 2005 at 02:44:31AM +0100, Osamu Aoki wrote:
> On Fri, Feb 11, 2005 at 02:27:03PM -0600, Ardo van Rangelrooij wrote:
> > Hi,
> > 
> > I've completed the setup of the DebianDoc-SGML project on Alioth.

That's why I CCed debiandoc-sgml-devel.

> Few thoughts on changes:
> 
>  * debiandoc2latexps vs. debiandoc2ps
>  Since we will not be creating groff path etc., I think we shouls
>  replace debiandoc2ps with symlink to debiandoc2latexps.  The same for
>  debiandoc2dvi and debiandoc2pdf.  What do you think.
>  (This should reduce potential bug.)

If debiandoc2{dvi,ps,pdf} have options supported by
debiandoc2latex{dvi,ps,pdf} I agree. Using a wrapper script instead of
symlinks may increase compatibility (windows :-))

>  * bin/template
>  In order to have consistency and better bug tracing, we should generate 
>  all scripts from a single template.
> 
>  I actually created alternative simpler "bin/mkconversions" to
>  streamline this.  This new "bin/mkconversions" reduces abstruction
>  layers when reading template file:
> 
>   now: template -> variable names references (mkconversions) -> sed script
>   new: template with section marked with format -> sed script
> 
>  Now @@@...@@@ is like for sections active only under latex, latexdvi,
>  latexps, and latexpdf:
>  
>  @@@start-latex-latexdvi-latexps-latexpdf-active@@@
>          -s <script>      apply script on latex generated file
>  @@@end-latex-latexdvi-latexps-latexpdf-active@@@
> 
>  Is this acceptable change?

It is (under the assumption, that template is still readable).
Is the option -s necessary for debiandoc2latex (you suggested to move this
functionality to debiandoc2latex but using a common template this should
not be necessary, right)?

PS: Osamu, please subscribe to the mailing lists.

Jens


From osamu@debian.org  Sun Feb 13 02:57:05 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 03:57:05 +0100
Subject: [debiandoc-sgml-devel] Re: DebianDoc-SGML Alioth project up and running
In-Reply-To: <20050213005250.GA27860@pluto>
References: <20050211202703.GE328@sbcglobal.net> <20050212014431.GA17267@aokiconsulting.com> <20050213005250.GA27860@pluto>
Message-ID: <20050213025705.GA19384@aokiconsulting.com>

Hi,

On Sun, Feb 13, 2005 at 01:52:50AM +0100, Jens Seidel wrote:
> On Sat, Feb 12, 2005 at 02:44:31AM +0100, Osamu Aoki wrote:
> > On Fri, Feb 11, 2005 at 02:27:03PM -0600, Ardo van Rangelrooij wrote:
> > > Hi,
> > > 
> > > I've completed the setup of the DebianDoc-SGML project on Alioth.
> 
> That's why I CCed debiandoc-sgml-devel.
> 
> > Few thoughts on changes:
> > 
> >  * debiandoc2latexps vs. debiandoc2ps
> >  Since we will not be creating groff path etc., I think we shouls
> >  replace debiandoc2ps with symlink to debiandoc2latexps.  The same for
> >  debiandoc2dvi and debiandoc2pdf.  What do you think.
> >  (This should reduce potential bug.)
> 
> If debiandoc2{dvi,ps,pdf} have options supported by
> debiandoc2latex{dvi,ps,pdf} I agree. Using a wrapper script instead of
> symlinks may increase compatibility (windows :-))

Let me double check.

> >  * bin/template
> >  In order to have consistency and better bug tracing, we should generate 
> >  all scripts from a single template.
> > 
> >  I actually created alternative simpler "bin/mkconversions" to
> >  streamline this.  This new "bin/mkconversions" reduces abstruction
> >  layers when reading template file:
> > 
> >   now: template -> variable names references (mkconversions) -> sed script
> >   new: template with section marked with format -> sed script
> > 
> >  Now @@@...@@@ is like for sections active only under latex, latexdvi,
> >  latexps, and latexpdf:
> >  
> >  @@@start-latex-latexdvi-latexps-latexpdf-active@@@
> >          -s <script>      apply script on latex generated file
> >  @@@end-latex-latexdvi-latexps-latexpdf-active@@@
> > 
> >  Is this acceptable change?
> 
> It is (under the assumption, that template is still readable).

Actually it will be more like C program with many # ifdef ... || ... |||
It is quite readable and I will compare code in generated form to give
smooth transition.

I realize that with small change to debiandoc2info we may add
debiandoc2xml since texinfo can be converted to docbook-xml.  (makeinfo)

Anyway, let's apply other updates first.

> Is the option -s necessary for debiandoc2latex (you suggested to move this
> functionality to debiandoc2latex but using a common template this should
> not be necessary, right)?

I will double check.  If they were different, they should have been bug.

> PS: Osamu, please subscribe to the mailing lists.

Yes done.  I was working on different thing tonight.  Nothing was done.


From jensseidel@users.sf.net  Sun Feb 13 16:31:27 2005
From: jensseidel@users.sf.net (Jens Seidel)
Date: Sun, 13 Feb 2005 17:31:27 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
Message-ID: <20050213163127.GA3208@pluto>

Hi all,

I committed the patch we discussed about.

Now it's Osamus task to change remaining stuff ...

Please note that I got the following error during commit:
debiandoc-sgml$ cvs ci -m"added homepage" debian/control
Checking in debian/control;
/cvsroot/debiandoc-sgml/debiandoc-sgml/debian/control,v  <--  control
new revision: 1.5; previous revision: 1.4
done
Could not open(/cvsroot/debiandoc-sgml/CVSROOT/commitlog): Permission denied

The problem are wrong permissions of
/cvsroot/debiandoc-sgml/CVSROOT/commitlog:

jseidel-guest@haydn:/cvsroot/debiandoc-sgml/CVSROOT$ ls -l commitlog
-rw-r--r--    1 ardo     debiando     5675 Feb 11 12:24 commitlog

Ardo, can you please make this file group writeable?

Jens


From ardo@debian.org  Sun Feb 13 17:01:10 2005
From: ardo@debian.org (Ardo van Rangelrooij)
Date: Sun, 13 Feb 2005 11:01:10 -0600
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213163127.GA3208@pluto>
References: <20050213163127.GA3208@pluto>
Message-ID: <20050213170110.GD29156@sbcglobal.net>

Jens Seidel (jensseidel@users.sf.net) wrote:
> Hi all,
> 
> I committed the patch we discussed about.
> 
> Now it's Osamus task to change remaining stuff ...
> 
> Please note that I got the following error during commit:
> debiandoc-sgml$ cvs ci -m"added homepage" debian/control
> Checking in debian/control;
> /cvsroot/debiandoc-sgml/debiandoc-sgml/debian/control,v  <--  control
> new revision: 1.5; previous revision: 1.4
> done
> Could not open(/cvsroot/debiandoc-sgml/CVSROOT/commitlog): Permission denied
> 
> The problem are wrong permissions of
> /cvsroot/debiandoc-sgml/CVSROOT/commitlog:
> 
> jseidel-guest@haydn:/cvsroot/debiandoc-sgml/CVSROOT$ ls -l commitlog
> -rw-r--r--    1 ardo     debiando     5675 Feb 11 12:24 commitlog
> 
> Ardo, can you please make this file group writeable?

Done.

Thanks,
Ardo
-- 
Ardo van Rangelrooij                                     Debian XML/SGML Group
<ardo@debian.org>              <debian-xml-sgml-devel@lists.alioth.debian.org>
http://people.debian.org/~ardo/      http://debian-xml-sgml.alioth.debian.org/


From ardo@debian.org  Sun Feb 13 17:07:41 2005
From: ardo@debian.org (Ardo van Rangelrooij)
Date: Sun, 13 Feb 2005 11:07:41 -0600
Subject: [debiandoc-sgml-devel] Re: DebianDoc-SGML Alioth project up and running
In-Reply-To: <20050213005250.GA27860@pluto>
References: <20050211202703.GE328@sbcglobal.net> <20050212014431.GA17267@aokiconsulting.com> <20050213005250.GA27860@pluto>
Message-ID: <20050213170741.GE29156@sbcglobal.net>

Just to make sure we're on the same page here: The intend of debiandoc2ps and
debiandoc2pdf was that in the case of multiple paths from SGML to PS/PDF one
would get a certain default (e.g. with LaTeX as intermediate format) but with
the option to specify another intermediate format (e.g. GROFF or Texinfo).

Also, we need to keep debiandoc2ps for legacy reasons (otherwise we ge into
another fight with Ian Jackson and his userv package; I don't want to go
their again).

So, given the fact we don't have any other path to PS and PDF other than
through LaTeX, it's ok to add the -s option to debiandoc2ps/pdf.

I'm still not clear what you guys are planning on doing with the template.

Jens Seidel (jensseidel@users.sf.net) wrote:
> On Sat, Feb 12, 2005 at 02:44:31AM +0100, Osamu Aoki wrote:
> > On Fri, Feb 11, 2005 at 02:27:03PM -0600, Ardo van Rangelrooij wrote:
> > > Hi,
> > > 
> > > I've completed the setup of the DebianDoc-SGML project on Alioth.
> 
> That's why I CCed debiandoc-sgml-devel.
> 
> > Few thoughts on changes:
> > 
> >  * debiandoc2latexps vs. debiandoc2ps
> >  Since we will not be creating groff path etc., I think we shouls
> >  replace debiandoc2ps with symlink to debiandoc2latexps.  The same for
> >  debiandoc2dvi and debiandoc2pdf.  What do you think.
> >  (This should reduce potential bug.)
> 
> If debiandoc2{dvi,ps,pdf} have options supported by
> debiandoc2latex{dvi,ps,pdf} I agree. Using a wrapper script instead of
> symlinks may increase compatibility (windows :-))
> 
> >  * bin/template
> >  In order to have consistency and better bug tracing, we should generate 
> >  all scripts from a single template.
> > 
> >  I actually created alternative simpler "bin/mkconversions" to
> >  streamline this.  This new "bin/mkconversions" reduces abstruction
> >  layers when reading template file:
> > 
> >   now: template -> variable names references (mkconversions) -> sed script
> >   new: template with section marked with format -> sed script
> > 
> >  Now @@@...@@@ is like for sections active only under latex, latexdvi,
> >  latexps, and latexpdf:
> >  
> >  @@@start-latex-latexdvi-latexps-latexpdf-active@@@
> >          -s <script>      apply script on latex generated file
> >  @@@end-latex-latexdvi-latexps-latexpdf-active@@@
> > 
> >  Is this acceptable change?
> 
> It is (under the assumption, that template is still readable).
> Is the option -s necessary for debiandoc2latex (you suggested to move this
> functionality to debiandoc2latex but using a common template this should
> not be necessary, right)?
> 
> PS: Osamu, please subscribe to the mailing lists.
> 
> Jens
> 
> _______________________________________________
> Debiandoc-sgml-devel mailing list
> Debiandoc-sgml-devel@lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/debiandoc-sgml-devel

-- 
Ardo van Rangelrooij                                     Debian XML/SGML Group
<ardo@debian.org>              <debian-xml-sgml-devel@lists.alioth.debian.org>
http://people.debian.org/~ardo/      http://debian-xml-sgml.alioth.debian.org/


From osamu@debian.org  Sun Feb 13 19:52:39 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 20:52:39 +0100
Subject: [debiandoc-sgml-devel] Re: DebianDoc-SGML Alioth project up and running
In-Reply-To: <20050213170741.GE29156@sbcglobal.net>
References: <20050211202703.GE328@sbcglobal.net> <20050212014431.GA17267@aokiconsulting.com> <20050213005250.GA27860@pluto> <20050213170741.GE29156@sbcglobal.net>
Message-ID: <20050213195238.GA16663@aokiconsulting.com>

Hi,

On Sun, Feb 13, 2005 at 11:07:41AM -0600, Ardo van Rangelrooij wrote:
> Just to make sure we're on the same page here: The intend of debiandoc2ps and
> debiandoc2pdf was that in the case of multiple paths from SGML to PS/PDF one
> would get a certain default (e.g. with LaTeX as intermediate format) but with
> the option to specify another intermediate format (e.g. GROFF or Texinfo).

Now that DocBook XML can be generated :-) We can have smooth transition
and we should not bloat this program any more.

> Also, we need to keep debiandoc2ps for legacy reasons (otherwise we ge into
> another fight with Ian Jackson and his userv package; I don't want to go
> their again).

Hmmm...  interesting fact.  I will keep myself away from trouble :-)

> So, given the fact we don't have any other path to PS and PDF other than
> through LaTeX, it's ok to add the -s option to debiandoc2ps/pdf.

Yes.

> I'm still not clear what you guys are planning on doing with the template.

By unifying similar script to a single file, it is much easier to
maintain without oversight.  Of course, I do not want to have too much
at one time, so I made modification to the generated script to the
minimum this time.

This actually made me to read the source again.  Now I realized that it
was almost 1 line hack to create clean DocBook XML from this file.

No more manual work needed to Debiandoc SGML file converted to DocBook 
XML.  Sweet!

As for post process -s <script> option, it is best included in the
following scripts since these creates tex or texinfo file as
intermediate file.  There may be some small modification needed to
process these files with existing tools.
 LaTeX:
  debiandoc2latexdvi and symlink to it: debiandoc2dvi
  debiandoc2latexps  and symlink to it: debiandoc2ps
  debiandoc2latexpdf and symlink to it: debiandoc2pdf
 Texinfo:
  debiandoc2info
  debiandoc2xml

fixlatex is provided as a default script to handle Chinese big5 related
issues.

Since Ardo seem to be not fully convinced, let me upload test package
(tested to build debian-reference without using its internal alternative
debiandoc2* scripts.)

It is apt-gettable 

deb http://people.debian.org/~osamu/package/ ./
deb-src http://people.debian.org/~osamu/package/ ./

"make diff" will create diff between your local system and packaged
version of scripts as scripts.diff :-)

If it is OK to maker this rather seemingly big change (but it is small
in reality), I will CVS commit to CVS and upload it.  I do not want to
create too many complicated commit yet.

So far html, pdf (including chinese, japanese, ...) and XML working fine
here.

Osamu




From osamu@debian.org  Sun Feb 13 20:30:50 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 21:30:50 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213170110.GD29156@sbcglobal.net>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net>
Message-ID: <20050213203050.GA20423@aokiconsulting.com>

On Sun, Feb 13, 2005 at 11:01:10AM -0600, Ardo van Rangelrooij wrote:
> Jens Seidel (jensseidel@users.sf.net) wrote:
> > Hi all,
> > 
> > I committed the patch we discussed about.
> > 
> > Now it's Osamus task to change remaining stuff ...

I have not read this when I posted message.

As you see, I made complete package.  So some merging needed.  

But since this is seemingly distruptive source change (with actual
change being very conservative.), I want you to assess this aproach
before commiting to the CVS.  If there is a flaw in aproach, maybe
better fix now than after CVS commit.

I honstly think this is good package.



From osamu@debian.org  Sun Feb 13 20:50:02 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 21:50:02 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213203050.GA20423@aokiconsulting.com>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com>
Message-ID: <20050213205002.GA22556@aokiconsulting.com>

--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--


From jensseidel@users.sf.net  Sun Feb 13 22:15:49 2005
From: jensseidel@users.sf.net (Jens Seidel)
Date: Sun, 13 Feb 2005 23:15:49 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213205002.GA22556@aokiconsulting.com>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com> <20050213205002.GA22556@aokiconsulting.com>
Message-ID: <20050213221549.GA5249@pluto>

On Sun, Feb 13, 2005 at 09:50:02PM +0100, Osamu Aoki wrote:
> 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

Is the patch complete, against CVS?

> @@ -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

Please remove the added two lines. The provided fixlatex script is
internal and completely independent of a user specified script. It's also
called in a different way, directly from debiandoc2latex.

I will check your changes tomorrow.

Jens


From ardo@debian.org  Sun Feb 13 22:19:33 2005
From: ardo@debian.org (Ardo van Rangelrooij)
Date: Sun, 13 Feb 2005 16:19:33 -0600
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213203050.GA20423@aokiconsulting.com>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com>
Message-ID: <20050213221933.GG29156@sbcglobal.net>

Osamu Aoki (osamu@debian.org) wrote:
> On Sun, Feb 13, 2005 at 11:01:10AM -0600, Ardo van Rangelrooij wrote:
> > Jens Seidel (jensseidel@users.sf.net) wrote:
> > > Hi all,
> > > 
> > > I committed the patch we discussed about.
> > > 
> > > Now it's Osamus task to change remaining stuff ...
> 
> I have not read this when I posted message.
> 
> As you see, I made complete package.  So some merging needed.  
> 
> But since this is seemingly distruptive source change (with actual
> change being very conservative.), I want you to assess this aproach
> before commiting to the CVS.  If there is a flaw in aproach, maybe
> better fix now than after CVS commit.

You can always branch of 1.1.85 (the latest version in CVS and build and
test from there.  Once everything is ok, you can then merge it onto the
main branch.

Thanks,
Ardo
-- 
Ardo van Rangelrooij                                     Debian XML/SGML Group
<ardo@debian.org>              <debian-xml-sgml-devel@lists.alioth.debian.org>
http://people.debian.org/~ardo/      http://debian-xml-sgml.alioth.debian.org/


From osamu@debian.org  Sun Feb 13 20:23:55 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 21:23:55 +0100
Subject: [debiandoc-sgml-devel] Re: DebianDoc-SGML Alioth project up and running
In-Reply-To: <20050213005250.GA27860@pluto>
References: <20050211202703.GE328@sbcglobal.net> <20050212014431.GA17267@aokiconsulting.com> <20050213005250.GA27860@pluto>
Message-ID: <20050213202355.GA20084@aokiconsulting.com>

--mP3DRpeJDSE+ciuQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

On Sun, Feb 13, 2005 at 01:52:50AM +0100, Jens Seidel wrote:
> It is (under the assumption, that template is still readable).

Not too easy but it is quite usable.  we can always use diff to
generated files as a review point.  I found that merging all similar
codes into one file reduces missed bug fixes for particular output form.

> Is the option -s necessary for debiandoc2latex (you suggested to move this
> functionality to debiandoc2latex but using a common template this should
> not be necessary, right)?

I will retract applying in debiandoc2latex.  You are right we can apply
outside of the script.

I actually consolidated all the debioandoc2* codes into one template.

Since texinfo supports dockbook XML, I even added XML conversion.

Option -s is needed not only for latex files but texinfo files.  Both
are supported.

As for debiandoc2latex* vs. debiandoc2* issues, there may have papersize
issues due to the bug, but symlinking only fix them.  Command
syntax should be the same per manpage and sctipt except bugs in the
script.

By the way, I intensionally made this template not to fix all the minor
bugs but kept old behavior of script as possible to reduce possible
problems.  They are marked so, it will be easy to fine tune it later.

I made -s option for latex to have default script : fixlatex since no
one loose by doing this.

Useless  if ! ${stdout} are actually removed from source.

Osamu

PS: Attached is the diff from 1.1.84 to new generated debiandoc2* files.



--mP3DRpeJDSE+ciuQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="auto.diff"

--- /usr/bin/debiandoc2html	2004-10-20 05:53:52.000000000 +0200
+++ debiandoc2html	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
--- /usr/bin/debiandoc2info	2004-01-03 02:32:16.000000000 +0100
+++ debiandoc2info	2005-02-13 16:03:10.000000000 +0100
@@ -30,6 +30,7 @@
          -e <extension>   extension to be used
          -k               keep intermediate files
          -l <locale>      locale to be used
+         -s <script>      apply script on texinfo generated file
          -n <options>     nsgmls options to be passed on
          -v               be verbose
 END
@@ -57,12 +58,14 @@
 ## set default values
 basename=''
 content=''
+postprocessing=''
 declaration=''
 extension=''
 keep=false
 keepopt=''
 locale=''
 nsgmls=''
+stdout=false
 verbose=false
 
 ## ----------------------------------------------------------------------
@@ -71,6 +74,7 @@
 options="${options}h"
 options="${options}b:"
 options="${options}c"
+options="${options}s:"
 options="${options}d:"
 options="${options}e:"
 options="${options}k"
@@ -87,6 +91,8 @@
 	     ;;
 	c  ) content="-${opt}"
 	     ;;
+	s  ) postprocessing="${OPTARG}"
+	     ;;
 	d  ) declaration="-${opt} ${OPTARG}"
 	     ;;
 	e  ) extension="-${opt} ${OPTARG}"
@@ -171,6 +177,10 @@
     echo >&2 "${script}: ERROR: ${bsn}.texinfo could not be generated properly"
     exit 1
 fi
+if [ -n "${postprocessing}" ]
+then
+    "${postprocessing}" ${locale} ${bsn}.texinfo
+fi
 if ! ( ${verbose} || exec >/dev/null 2>&1;
        makeinfo --no-validate -v -o ${bsn}${cnt}${ext} ${bsn}.texinfo )
 then
--- /usr/bin/debiandoc2latex	2004-10-20 05:53:52.000000000 +0200
+++ debiandoc2latex	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
@@ -112,10 +112,6 @@
 	      usage_error "-k not possible with input from stdin"
 	  fi
 	  stdout=true
-	  if ! ${stdout}
-	  then
-	      usage_error "stdin not allowed with debiandoc2latex"
-	  fi
 	  ;;
     -?* ) nsgmlsi="./${1}"
 	  ;;
--- /usr/bin/debiandoc2latexdvi	2004-01-03 02:32:16.000000000 +0100
+++ debiandoc2latexdvi	2005-02-13 16:03:10.000000000 +0100
@@ -31,6 +31,7 @@
          -e <extension>   extension to be used
          -k               keep intermediate files
          -l <locale>      locale to be used
+         -s <script>      apply script on latex generated file
          -n <options>     nsgmls options to be passed on
          -p <papersize>   paper size to be used
          -v               be verbose
@@ -80,6 +81,7 @@
 ## set default values
 basename=''
 content=''
+postprocessing='fixlatex'
 declaration=''
 extension=''
 keep=false
@@ -96,6 +98,7 @@
 options="${options}O"
 options="${options}b:"
 options="${options}c"
+options="${options}s:"
 options="${options}d:"
 options="${options}e:"
 options="${options}k"
@@ -115,6 +118,8 @@
 	     ;;
 	c  ) content="-${opt}"
 	     ;;
+	s  ) postprocessing="${OPTARG}"
+	     ;;
 	d  ) declaration="-${opt} ${OPTARG}"
 	     ;;	
 	e  ) extension="-${opt} ${OPTARG}"
@@ -126,8 +131,8 @@
 	     ;;
 	n  ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
 	     ;;
-	p  ) PAPERCONF=${OPTARG}
-	     export PAPERCONF
+	p  ) PAPERSIZE=${OPTARG}
+	     export PAPERSIZE
 	     ;;
 	v  ) verbose=true
 	     ;;
@@ -202,6 +207,10 @@
     echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
     exit 1
 fi
+if [ -n "${postprocessing}" ]
+then
+    "${postprocessing}" ${locale} ${bsn}.tex
+fi
 if [ -e ${bsn}.dvi ] && ( [ -n "${content}" ] || [ -n "${extension}" ] )
 then
     echo >&2 "${script}: WARNING: overwriting ${bsn}.dvi"
--- /usr/bin/debiandoc2latexpdf	2004-01-03 02:32:16.000000000 +0100
+++ debiandoc2latexpdf	2005-02-13 16:03:10.000000000 +0100
@@ -31,6 +31,7 @@
          -e <extension>   extension to be used
          -k               keep intermediate files
          -l <locale>      locale to be used
+         -s <script>      apply script on latex generated file
          -n <options>     nsgmls options to be passed on
          -p <papersize>   paper size to be used
          -v               be verbose
@@ -50,7 +51,7 @@
 ## check for presence of pdflatex
 if ! which pdflatex >/dev/null 2>&1
 then
-    echo >&2 "${script}: LaTeX documentation system not found"
+    echo >&2 "${script}: LaTeX typesetting system not found"
     echo >&2 "${script}: please install the package 'tetex-bin'"
     exit 2
 fi
@@ -80,6 +81,7 @@
 ## set default values
 basename=''
 content=''
+postprocessing='fixlatex'
 declaration=''
 extension=''
 keep=false
@@ -96,6 +98,7 @@
 options="${options}O"
 options="${options}b:"
 options="${options}c"
+options="${options}s:"
 options="${options}d:"
 options="${options}e:"
 options="${options}k"
@@ -115,6 +118,8 @@
 	     ;;
 	c  ) content="-${opt}"
 	     ;;
+	s  ) postprocessing="${OPTARG}"
+	     ;;
 	d  ) declaration="-${opt} ${OPTARG}"
 	     ;;
 	e  ) extension="-${opt} ${OPTARG}"
@@ -126,8 +131,8 @@
 	     ;;
 	n  ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
 	     ;;
-	p  ) PAPERCONF=${OPTARG}
-	     export PAPERCONF
+	p  ) PAPERSIZE=${OPTARG}
+	     export PAPERSIZE
 	     ;;
 	v  ) verbose=true
 	     ;;
@@ -202,6 +207,10 @@
     echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
     exit 1
 fi
+if [ -n "${postprocessing}" ]
+then
+    "${postprocessing}" ${locale} ${bsn}.tex
+fi
 if [ -e ${bsn}.pdf ] && ( [ -n "${content}" ] || [ -n "${extension}" ] )
 then
     echo >&2 "${script}: WARNING: overwriting ${bsn}.pdf"
--- /usr/bin/debiandoc2latexps	2004-01-03 02:32:16.000000000 +0100
+++ debiandoc2latexps	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
@@ -31,6 +31,7 @@
          -e <extension>   extension to be used
          -k               keep intermediate files
          -l <locale>      locale to be used
+         -s <script>      apply script on latex generated file
          -n <options>     nsgmls options to be passed on
          -p <papersize>   paper size to be used
          -v               be verbose
@@ -47,10 +48,10 @@
 }
 
 ## ----------------------------------------------------------------------
-## check for presence of latex and dvips
-if ! which latex dvips >/dev/null 2>&1
+## check for presence of latex
+if ! which latex >/dev/null 2>&1
 then
-    echo >&2 "${script}: LaTeX documentation system not found"
+    echo >&2 "${script}: LaTeX typesetting system not found"
     echo >&2 "${script}: please install the package 'tetex-bin'"
     exit 2
 fi
@@ -80,6 +81,7 @@
 ## set default values
 basename=''
 content=''
+postprocessing='fixlatex'
 declaration=''
 extension=''
 keep=false
@@ -97,6 +99,7 @@
 options="${options}O"
 options="${options}b:"
 options="${options}c"
+options="${options}s:"
 options="${options}d:"
 options="${options}e:"
 options="${options}k"
@@ -116,6 +119,8 @@
 	     ;;
 	c  ) content="-${opt}"
 	     ;;
+	s  ) postprocessing="${OPTARG}"
+	     ;;
 	d  ) declaration="-${opt} ${OPTARG}"
 	     ;;
 	e  ) extension="-${opt} ${OPTARG}"
@@ -127,9 +132,9 @@
 	     ;;
 	n  ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
 	     ;;
-	p  ) PAPERCONF=${OPTARG}
-	     export PAPERCONF
-	     paperopt="-t ${PAPERCONF}"
+	p  ) PAPERSIZE=${OPTARG}
+	     export PAPERSIZE
+	     paperopt="-t ${PAPERSIZE}"
 	     ;;
 	v  ) verbose=true
 	     ;;
@@ -204,7 +209,11 @@
     echo >&2 "${script}: ERROR: ${bsn}.tex could not be generated properly"
     exit 1
 fi
-if [ -e ${bsn}.dvi ]
+if [ -n "${postprocessing}" ]
+then
+    "${postprocessing}" ${locale} ${bsn}.tex
+fi
+if [ -e ${bsn}.dvi ] && ( [ -n "${content}" ] || [ -n "${extension}" ] )
 then
     echo >&2 "${script}: WARNING: overwriting ${bsn}.dvi"
 fi
--- /usr/bin/debiandoc2texinfo	2004-10-20 05:53:52.000000000 +0200
+++ debiandoc2texinfo	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
@@ -112,10 +112,6 @@
 	      usage_error "-k not possible with input from stdin"
 	  fi
 	  stdout=true
-	  if ! ${stdout}
-	  then
-	      usage_error "stdin not allowed with debiandoc2texinfo"
-	  fi
 	  ;;
     -?* ) nsgmlsi="./${1}"
 	  ;;
--- /usr/bin/debiandoc2text	2004-10-20 05:53:52.000000000 +0200
+++ debiandoc2text	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
@@ -117,10 +117,6 @@
 	      usage_error "-k not possible with input from stdin"
 	  fi
 	  stdout=true
-	  if ! ${stdout}
-	  then
-	      usage_error "stdin not allowed with debiandoc2text"
-	  fi
 	  ;;
     -?* ) nsgmlsi="./${1}"
 	  ;;
--- /usr/bin/debiandoc2textov	2004-10-20 05:53:52.000000000 +0200
+++ debiandoc2textov	2005-02-13 16:03:10.000000000 +0100
@@ -10,7 +10,7 @@
 script=$(basename ${0})
 
 ## ----------------------------------------------------------------------
-## print help message
+## print version and usage message
 function usage_message
 {
     cat >&2 <<'END'
@@ -117,10 +117,6 @@
 	      usage_error "-k not possible with input from stdin"
 	  fi
 	  stdout=true
-	  if ! ${stdout}
-	  then
-	      usage_error "stdin not allowed with debiandoc2textov"
-	  fi
 	  ;;
     -?* ) nsgmlsi="./${1}"
 	  ;;

--mP3DRpeJDSE+ciuQ--


From osamu@debian.org  Sun Feb 13 22:43:58 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 13 Feb 2005 23:43:58 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213221549.GA5249@pluto>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com> <20050213205002.GA22556@aokiconsulting.com> <20050213221549.GA5249@pluto>
Message-ID: <20050213224358.GB17820@aokiconsulting.com>

On Sun, Feb 13, 2005 at 11:15:49PM +0100, Jens Seidel wrote:
> > +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
> 
> Please remove the added two lines. The provided fixlatex script is
> internal and completely independent of a user specified script. It's also
> called in a different way, directly from debiandoc2latex.

Well, that what you did in the old template file.

> I will check your changes tomorrow.

I apply fixlatex as the default value for -s option for debiandoc2latex*
commands.  In my private package, default value for -s option is
fixlatex.  By the way, I do not have -s option for debiandoc2latex or
debiandoc2texinfo since you have direct access to the output file after
thinking your comments.

I may have to change wording since its path is private one but providing
usr/share/debiandoc-sgml/fixlatex as default is a good idea.  We have
way to overide it.

Osamu


From osamu@debian.org  Mon Feb 14 00:09:12 2005
From: osamu@debian.org (Osamu Aoki)
Date: Mon, 14 Feb 2005 01:09:12 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050213221933.GG29156@sbcglobal.net>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com> <20050213221933.GG29156@sbcglobal.net>
Message-ID: <20050214000912.GA20508@aokiconsulting.com>

Sorry,

On Sun, Feb 13, 2005 at 04:19:33PM -0600, Ardo van Rangelrooij wrote:
> Osamu Aoki (osamu@debian.org) wrote:
> You can always branch of 1.1.85 (the latest version in CVS and build and
> test from there.  Once everything is ok, you can then merge it onto the
> main branch.

I made osamu_branch_root at HEAD and I thought creating osamu_branch ...
alas, I commited to HEAD. (somehow osamu_branch and osamu_branch_root
stayed the same. Sorry,...  You want to revert or are we continue. Let
me know.

I wonder why Jens was making 1.1.87.  tag and archive seem to indicate
there were only 1.1.85 released.

I have a request.  Let's make change log to track CVS activity but also
indicate release state.  Maybe we should mangle version name when it is
CVS unreleased version.  When releasing, change to real version.

1.1.85 
 -> 1.1.85.cvsXXXX (when working on CVS)
 -> 1.1.86 (release)

This should redule version infration.

Osamu



From ardo@debian.org  Mon Feb 14 02:10:09 2005
From: ardo@debian.org (Ardo van Rangelrooij)
Date: Sun, 13 Feb 2005 20:10:09 -0600
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050214000912.GA20508@aokiconsulting.com>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com> <20050213221933.GG29156@sbcglobal.net> <20050214000912.GA20508@aokiconsulting.com>
Message-ID: <20050214021012.GI29156@sbcglobal.net>

Osamu Aoki (osamu@debian.org) wrote:
> Sorry,
> 
> On Sun, Feb 13, 2005 at 04:19:33PM -0600, Ardo van Rangelrooij wrote:
> > Osamu Aoki (osamu@debian.org) wrote:
> > You can always branch of 1.1.85 (the latest version in CVS and build and
> > test from there.  Once everything is ok, you can then merge it onto the
> > main branch.
> 
> I made osamu_branch_root at HEAD and I thought creating osamu_branch ...
> alas, I commited to HEAD. (somehow osamu_branch and osamu_branch_root
> stayed the same. Sorry,...  You want to revert or are we continue. Let
> me know.
> 
> I wonder why Jens was making 1.1.87.  tag and archive seem to indicate
> there were only 1.1.85 released.
> 
> I have a request.  Let's make change log to track CVS activity but also
> indicate release state.  Maybe we should mangle version name when it is
> CVS unreleased version.  When releasing, change to real version.
> 
> 1.1.85 
>  -> 1.1.85.cvsXXXX (when working on CVS)
>  -> 1.1.86 (release)
> 
> This should redule version infration.

Using a branch is much safer.  You can then also do proper tag management for
reverting back to a previuos tag on your branch.

Thanks,
Ardo
-- 
Ardo van Rangelrooij                                     Debian XML/SGML Group
<ardo@debian.org>              <debian-xml-sgml-devel@lists.alioth.debian.org>
http://people.debian.org/~ardo/      http://debian-xml-sgml.alioth.debian.org/


From osamu@debian.org  Mon Feb 14 21:31:56 2005
From: osamu@debian.org (Osamu Aoki)
Date: Mon, 14 Feb 2005 22:31:56 +0100
Subject: [debiandoc-sgml-devel] Committed first patch
In-Reply-To: <20050214021012.GI29156@sbcglobal.net>
References: <20050213163127.GA3208@pluto> <20050213170110.GD29156@sbcglobal.net> <20050213203050.GA20423@aokiconsulting.com> <20050213221933.GG29156@sbcglobal.net> <20050214000912.GA20508@aokiconsulting.com> <20050214021012.GI29156@sbcglobal.net>
Message-ID: <20050214213156.GA28603@aokiconsulting.com>

Hi,

I did revert and use osamu_branch now.

But my question remains.  If in main branch, should we increase version
number without release?  I see:

  ardo created 1.1.86
  jens followed and cereated 1.1.87

I do not see why.  Changelog should be more like:

debiandoc-sgml (1.1.86) unstable; urgency=low

  * Reorganize source to generate all debiandoc2* files from a single
    template file. [osamu]
  * Add DocBook XML generation capability with new debiandoc2xml command
    using Texinfo tool sets. [osamu]
  * Added support for Slovenian (closes: Bug#291481) [jens]

If you insist to have next version number here for the first commit
after release, we need to be sure this version was not released.  One
easy way is to use TAG.  If CVS is taged with debean_version_1_1_?? , we
can safely consider this to be released. 

Any agreed method to update changelog will be nice for HEAD branch.

Osamu


From osamu@debian.org  Wed Feb 16 18:59:34 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 19:59:34 +0100
Subject: [debiandoc-sgml-devel] osamu_branch test request.
Message-ID: <20050216185934.GB29645@aokiconsulting.com>

Folks,

osamu_branch is complete.  I am proofing some documentation things now.
No more script change.

Since this involves some code reorganization around template, diff for
tools/bin/* are not so useful for people to check its contents.

In order to accomodate easy inspection of these new generated
debiandoc2* commands, the build script in osamu_branch includes a small
helper.  When you build this package in a system where debiandoc2*
commands are installed, there will be a diff file (scripts.diff) between
new generated commands and installed counter parts.  So you can easily
check what changes will happen.

Also, I have comments in template file.  It should help you to
understand how I created these.  Basically, command line option
processing are common for all.  Then actual processing are grouped in 3
sections.

First section is for the formats originally in template which is
directly converted from SGML.
   html, text, textov, latex, and texinfo

The second section is for LaTeX tool set.
   dvi, ps, pdf

The third section is for Texinfo tool set.
   info, xml

I hope comments inside makes it clear.

I found some input file name handling being irregular.  But for this
upload, I took conservative approach not to change them.

So this is minimal patch (by observing scripts.diff).

It can build Korean and all other documents here.  (I will test more).

Please help me inspect these.

I want to upload this version since this gives great transition to XML
by offering debiandoc2xml :-)

Osamu




From osamu@debian.org  Wed Feb 16 20:16:36 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 21:16:36 +0100
Subject: [debiandoc-sgml-devel] Re: Bug#293753: Update?
In-Reply-To: <20050216003712.GG17277@riseup.net>
References: <20050215220402.GZ17277@riseup.net> <20050215230804.GC12667@aokiconsulting.com> <20050216003712.GG17277@riseup.net>
Message-ID: <20050216201636.GA993@aokiconsulting.com>

On Tue, Feb 15, 2005 at 06:37:12PM -0600, Micah Anderson wrote:
> pbuilder: Failed autobuilding of package
> 
> > > Any updates on this?
> > 
> > So this build problem seems architecture dependent issue or memory
> > allocation issue.  I can not reproduce it.  Can anyone point me to build
> > log?
> 
> see above... it fails on i386, I suspect that you are building 1.2.2,
> not 1.2.3.

You are right.  I must have build only with debuild on particular source
tree for 1.2.3.

This build script has bug of reading script from next source tree
(debian-reference).

But generated files were better than doing trivial fix as suggested in
the bug report.

So my plan to fix this is as follows:

 * fix source but make it build with next version of debiandoc-sgml
   (No more special build script in the source.)
 * upload new debiandoc-sgml (by merging osamu_branch to MAIN and uploading)
 * Then upload fixed version of maint-guide using it.
 * At this time, new pdebuid behavior may be reflected in the document
   (They generate file as user owned now)

If you agree not to do upload just to close FTBFS bug for documentation
which will yield less generated documents or unaesthetic build script, I
will downgrade this to "important" and focus on debiandoc-sgml update.

We need root cause fix :-)

Osamu



From osamu@debian.org  Wed Feb 16 20:32:37 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 21:32:37 +0100
Subject: [debiandoc-sgml-devel] Bug fixed
Message-ID: <20050216203237.GA4870@aokiconsulting.com>

Hmmm... I must have made wrong change at last minites to Makefile...
Just fixed in CVS.

Osamu


From osamu@debian.org  Wed Feb 16 20:43:18 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 21:43:18 +0100
Subject: [debiandoc-sgml-devel] Bug fixed
In-Reply-To: <20050216203237.GA4870@aokiconsulting.com>
References: <20050216203237.GA4870@aokiconsulting.com>
Message-ID: <20050216204318.GA5892@aokiconsulting.com>

On Wed, Feb 16, 2005 at 09:32:37PM +0100, Osamu Aoki wrote:
> Hmmm... I must have made wrong change at last minites to Makefile...
> Just fixed in CVS.

But this still have bug ... :-(

I did not realize jans's Makefile had specific outside path used.
fixlatex is not forking if it use internal one....



From micah@riseup.net  Wed Feb 16 21:15:12 2005
From: micah@riseup.net (Micah Anderson)
Date: Wed, 16 Feb 2005 15:15:12 -0600
Subject: [debiandoc-sgml-devel] Re: Bug#293753: Update?
In-Reply-To: <20050216201636.GA993@aokiconsulting.com>
References: <20050215220402.GZ17277@riseup.net> <20050215230804.GC12667@aokiconsulting.com> <20050216003712.GG17277@riseup.net> <20050216201636.GA993@aokiconsulting.com>
Message-ID: <20050216211512.GB17277@riseup.net>

--sr8SBrQ3fbgntwtR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Osamu Aoki schrieb am Wednesday, den 16. February 2005:

> On Tue, Feb 15, 2005 at 06:37:12PM -0600, Micah Anderson wrote:
> > pbuilder: Failed autobuilding of package
> >=20
> > > > Any updates on this?
> > >=20
> > > So this build problem seems architecture dependent issue or memory
> > > allocation issue.  I can not reproduce it.  Can anyone point me to bu=
ild
> > > log?
> >=20
> > see above... it fails on i386, I suspect that you are building 1.2.2,
> > not 1.2.3.
>=20
> You are right.  I must have build only with debuild on particular source
> tree for 1.2.3.
>=20
> This build script has bug of reading script from next source tree
> (debian-reference).
>=20
> But generated files were better than doing trivial fix as suggested in
> the bug report.
>=20
> So my plan to fix this is as follows:
>=20
>  * fix source but make it build with next version of debiandoc-sgml
>    (No more special build script in the source.)
>  * upload new debiandoc-sgml (by merging osamu_branch to MAIN and uploadi=
ng)
>  * Then upload fixed version of maint-guide using it.
>  * At this time, new pdebuid behavior may be reflected in the document
>    (They generate file as user owned now)
>=20
> If you agree not to do upload just to close FTBFS bug for documentation
> which will yield less generated documents or unaesthetic build script, I
> will downgrade this to "important" and focus on debiandoc-sgml update.

It is against policy to downgrade this bug because it FTBS, which is a
grave bug and downgrading will cause this broken FTBS to migrate into
sarge causing RC problems. The bug has to remain severity grave tagged
sid. I will not NMU this.

> We need root cause fix :-)

Whatever needs to be done, do it. However if solving the root cause
means that 1.2.3 stays out of Sarge, and this is not acceptible, then
something else will need to be determined.

Micah

--sr8SBrQ3fbgntwtR
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFCE7fg9n4qXRzy1ioRAgruAJ4kI4j0yYbFgvSeYrZB5kTQl/pfngCfTZdp
Y91/6sIE9jw870Z4mglg0EI=
=xkdc
-----END PGP SIGNATURE-----

--sr8SBrQ3fbgntwtR--


From osamu@debian.org  Wed Feb 16 21:50:02 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 22:50:02 +0100
Subject: [debiandoc-sgml-devel] Bug really fixed  :-)
In-Reply-To: <20050216204318.GA5892@aokiconsulting.com>
References: <20050216203237.GA4870@aokiconsulting.com> <20050216204318.GA5892@aokiconsulting.com>
Message-ID: <20050216215002.GB5892@aokiconsulting.com>

On Wed, Feb 16, 2005 at 09:43:18PM +0100, Osamu Aoki wrote:
> On Wed, Feb 16, 2005 at 09:32:37PM +0100, Osamu Aoki wrote:
> > Hmmm... I must have made wrong change at last minites to Makefile...
> > Just fixed in CVS.
> 
> But this still have bug ... :-(
> 
> I did not realize jans's Makefile had specific outside path used.
> fixlatex is not forking if it use internal one....
                  working

Under my version, fixlatex does in place modification as it used to be
in debian-reference.

Now maint guide can be build with CJK even if its source is not in DDP
source tree.  (After removing PATH modification in maint-guide Makefile
which should happen in next release to avoid FTBFS bug.)

I check Korean and looks good.  (Of course debian/rule of maint-guide
needs to be fixed not to exclude CJK.

Darn, testing package is tough....  But I think it is really working.

Osamu



From osamu@debian.org  Wed Feb 16 21:56:25 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 22:56:25 +0100
Subject: [debiandoc-sgml-devel] Re: Bug#293753: Update?
In-Reply-To: <20050216211512.GB17277@riseup.net>
References: <20050215220402.GZ17277@riseup.net> <20050215230804.GC12667@aokiconsulting.com> <20050216003712.GG17277@riseup.net> <20050216201636.GA993@aokiconsulting.com> <20050216211512.GB17277@riseup.net>
Message-ID: <20050216215625.GC5892@aokiconsulting.com>

On Wed, Feb 16, 2005 at 03:15:12PM -0600, Micah Anderson wrote:
> >  * fix source but make it build with next version of debiandoc-sgml
> >    (No more special build script in the source.)
> >  * upload new debiandoc-sgml (by merging osamu_branch to MAIN and uploading)
> >  * Then upload fixed version of maint-guide using it.
> >  * At this time, new pdebuid behavior may be reflected in the document
> >    (They generate file as user owned now)
> > 
> > If you agree not to do upload just to close FTBFS bug for documentation
> > which will yield less generated documents or unaesthetic build script, I
> > will downgrade this to "important" and focus on debiandoc-sgml update.
> 
> It is against policy to downgrade this bug because it FTBS, which is a
> grave bug and downgrading will cause this broken FTBS to migrate into
> sarge causing RC problems. The bug has to remain severity grave tagged
> sid. I will not NMU this.

You are theoretically correct.

FYI:  There were FTBFS bug on this package but it was labeled
sarge-ignore by the RM.  I fixed it in the last upload.

> > We need root cause fix :-)
> 
> Whatever needs to be done, do it. However if solving the root cause
> means that 1.2.3 stays out of Sarge, and this is not acceptible, then
> something else will need to be determined.

Let me concentrate on what maters first please.  Also I do not mind this
situation now considering pbuilder had some change...

If you do NMU with corrected description on pdebuild behavior, I am
happy.

Osamu



From osamu@debian.org  Wed Feb 16 22:07:49 2005
From: osamu@debian.org (Osamu Aoki)
Date: Wed, 16 Feb 2005 23:07:49 +0100
Subject: [debiandoc-sgml-devel] Bug really fixed  :-) ru ja ko checked
In-Reply-To: <20050216215002.GB5892@aokiconsulting.com>
References: <20050216203237.GA4870@aokiconsulting.com> <20050216204318.GA5892@aokiconsulting.com> <20050216215002.GB5892@aokiconsulting.com>
Message-ID: <20050216220749.GD5892@aokiconsulting.com>

> Darn, testing package is tough....  But I think it is really working.

Now that I checked all pdf and ps files:
 en fr de ko ja pl pt_BR zh_CN
Looks nice.

I think it is time to merge into MAIN by the weekend and upload next
week.  I will be out of PC for weekend.

Osamu


From tux-master@web.de  Thu Feb 17 09:28:03 2005
From: tux-master@web.de (Jens Seidel)
Date: Thu, 17 Feb 2005 10:28:03 +0100
Subject: [debiandoc-sgml-devel] Bug fixed
Message-ID: <876516902@web.de>

Osamu Aoki <osamu@debian.org> schrieb am 16.02.05 21:40:36:
> 
> On Wed, Feb 16, 2005 at 09:32:37PM +0100, Osamu Aoki wrote:
> > Hmmm... I must have made wrong change at last minites to Makefile...
> > Just fixed in CVS.
> 
> But this still have bug ... :-(
> 
> I did not realize jans's Makefile had specific outside path used.
> fixlatex is not forking if it use internal one....

But I announced this on debian-doc. I suggested to copy fixlatex
and debiandoc2* from quick-reference into package source
as quick build fix. (I worked on www build host.)

After you announced a new main-guide package I asked you in a
private mail how you fixed this and how you avoid a FTBS.

There is not much more I can do about ...

Jens
__________________________________________________________
Mit WEB.DE FreePhone mit hoechster Qualitaet ab 0 Ct./Min.
weltweit telefonieren! http://freephone.web.de/?mc=021201



From osamu@debian.org  Thu Feb 17 23:31:37 2005
From: osamu@debian.org (Osamu Aoki)
Date: Fri, 18 Feb 2005 00:31:37 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
Message-ID: <20050217233137.GA14228@aokiconsulting.com>

Hi,

It took me a while to get hang on pbuilder reconfiguration issue.  Then
I touched debiandoc-sgml source again.  "Just cosmetic" was my intent
but I broke it once again by forgetting "/" since I was not focused.
Then fixed it. I re-upldated the package in p.d.o/~osamu site and CVS.
I hope I fixed it for sure.

I am building maint-guide (CVS) under pbuilder customized to use this
new package.

OTHERMIRROR="deb http://people.debian.org/~osamu/package/ ./"

Then "sudo pbuilder update --distribution sarge --override-config"

Then pdebuild :-)

I checked Chinese and Korean PDF.  Looks good :-)

Now I know pbuilder better.

Osamu

PS: If no one object, I will commit this to MAIN after Monday.  Then
upload if Ardo does not object.


From osamu@debian.org  Fri Feb 18 05:59:57 2005
From: osamu@debian.org (Osamu Aoki)
Date: Fri, 18 Feb 2005 06:59:57 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
In-Reply-To: <20050217233137.GA14228@aokiconsulting.com>
References: <20050217233137.GA14228@aokiconsulting.com>
Message-ID: <20050218055957.GA26114@aokiconsulting.com>

On Fri, Feb 18, 2005 at 12:31:37AM +0100, Osamu Aoki wrote:
> Hi,
> 
> It took me a while to get hang on pbuilder reconfiguration issue.  Then
> I touched debiandoc-sgml source again.  "Just cosmetic" was my intent
> but I broke it once again by forgetting "/" since I was not focused.
> Then fixed it. I re-upldated the package in p.d.o/~osamu site and CVS.
> I hope I fixed it for sure.
> 
> I am building maint-guide (CVS) under pbuilder customized to use this
> new package.

I woke up and found out debian-reference (CVS) was also build without
error under pbuilder.

So far very good.

Osamu


From osamu@debian.org  Sun Feb 20 22:03:20 2005
From: osamu@debian.org (Osamu Aoki)
Date: Sun, 20 Feb 2005 23:03:20 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
In-Reply-To: <20050218055957.GA26114@aokiconsulting.com>
References: <20050217233137.GA14228@aokiconsulting.com> <20050218055957.GA26114@aokiconsulting.com>
Message-ID: <20050220220320.GA20290@aokiconsulting.com>

On Fri, Feb 18, 2005 at 06:59:57AM +0100, Osamu Aoki wrote:
> On Fri, Feb 18, 2005 at 12:31:37AM +0100, Osamu Aoki wrote:
> > Hi,

After thinking this new change in french riviera over the weekend, I decided
to change command name from *2xml to be *2docbookxml.

This will avoid confusion later if we decide to add *2texinfoxml or so.

I need to test it but commited to CVS branch as is and going to sleep.

Osamu


From osamu@debian.org  Mon Feb 21 20:09:19 2005
From: osamu@debian.org (Osamu Aoki)
Date: Mon, 21 Feb 2005 21:09:19 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
In-Reply-To: <20050220220320.GA20290@aokiconsulting.com>
References: <20050217233137.GA14228@aokiconsulting.com> <20050218055957.GA26114@aokiconsulting.com> <20050220220320.GA20290@aokiconsulting.com>
Message-ID: <20050221200918.GA25641@aokiconsulting.com>

On Sun, Feb 20, 2005 at 11:03:20PM +0100, Osamu Aoki wrote:
> On Fri, Feb 18, 2005 at 06:59:57AM +0100, Osamu Aoki wrote:
> > On Fri, Feb 18, 2005 at 12:31:37AM +0100, Osamu Aoki wrote:
> > > Hi,
> 
> After thinking this new change in french riviera over the weekend, I decided
> to change command name from *2xml to be *2docbookxml.
> 
> This will avoid confusion later if we decide to add *2texinfoxml or so.
> 
> I need to test it but commited to CVS branch as is and going to sleep.

In line with the -k option behavior, I changed fixlatex syntax so it
will keep intermediate file.  In place modification is not good for
debuging.  So I changed this script

 fixlatex -l en infile outfile

So default action is now "cp infile outfile".  Chinese is piped.

I think this is the end of my changes.  I will check script and if there
is no error I will start moving to MAIN branch.  Everything jens did was
included already.

Osamu



From osamu@debian.org  Mon Feb 21 22:27:24 2005
From: osamu@debian.org (Osamu Aoki)
Date: Mon, 21 Feb 2005 23:27:24 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
In-Reply-To: <20050221200918.GA25641@aokiconsulting.com>
References: <20050217233137.GA14228@aokiconsulting.com> <20050218055957.GA26114@aokiconsulting.com> <20050220220320.GA20290@aokiconsulting.com> <20050221200918.GA25641@aokiconsulting.com>
Message-ID: <20050221222724.GA15268@aokiconsulting.com>

On Mon, Feb 21, 2005 at 09:09:19PM +0100, Osamu Aoki wrote:
> On Sun, Feb 20, 2005 at 11:03:20PM +0100, Osamu Aoki wrote:
> > On Fri, Feb 18, 2005 at 06:59:57AM +0100, Osamu Aoki wrote:
> > > On Fri, Feb 18, 2005 at 12:31:37AM +0100, Osamu Aoki wrote:
> > > > Hi,
> > 
> > After thinking this new change in french riviera over the weekend, I decided
> > to change command name from *2xml to be *2docbookxml.
> > 
> > This will avoid confusion later if we decide to add *2texinfoxml or so.
> > 
> > I need to test it but commited to CVS branch as is and going to sleep.
> 
> In line with the -k option behavior, I changed fixlatex syntax so it
> will keep intermediate file.  In place modification is not good for
> debuging.  So I changed this script
> 
>  fixlatex -l en infile outfile
> 
> So default action is now "cp infile outfile".  Chinese is piped.
> 
> I think this is the end of my changes.  I will check script and if there
> is no error I will start moving to MAIN branch.  Everything jens did was
> included already.

Uploaded and tagged.


From osamu@debian.org  Mon Feb 21 20:38:26 2005
From: osamu@debian.org (Osamu Aoki)
Date: Mon, 21 Feb 2005 21:38:26 +0100
Subject: [debiandoc-sgml-devel] Test build under pbuilder success
In-Reply-To: <20050221200918.GA25641@aokiconsulting.com>
References: <20050217233137.GA14228@aokiconsulting.com> <20050218055957.GA26114@aokiconsulting.com> <20050220220320.GA20290@aokiconsulting.com> <20050221200918.GA25641@aokiconsulting.com>
Message-ID: <20050221203825.GB25641@aokiconsulting.com>

On Mon, Feb 21, 2005 at 09:09:19PM +0100, Osamu Aoki wrote:
> On Sun, Feb 20, 2005 at 11:03:20PM +0100, Osamu Aoki wrote:
> > On Fri, Feb 18, 2005 at 06:59:57AM +0100, Osamu Aoki wrote:
> > > On Fri, Feb 18, 2005 at 12:31:37AM +0100, Osamu Aoki wrote:
> > > > Hi,
> > 
> > After thinking this new change in french riviera over the weekend, I decided
> > to change command name from *2xml to be *2docbookxml.
> > 
> > This will avoid confusion later if we decide to add *2texinfoxml or so.
> > 
> > I need to test it but commited to CVS branch as is and going to sleep.
> 
> In line with the -k option behavior, I changed fixlatex syntax so it
> will keep intermediate file.  In place modification is not good for
> debuging.  So I changed this script
> 
>  fixlatex -l en infile outfile
> 
> So default action is now "cp infile outfile".  Chinese is piped.
> 
> I think this is the end of my changes.  I will check script and if there
> is no error I will start moving to MAIN branch.  Everything jens did was
> included already.

This can build maint-guide under pbuilder.

I also checked debiandoc2docbookxml

It works to generate decently looking XML without issue.  If error
exist, it is backend problem, I think. 

I will merge this source to main now.