refdb-cvs Mailing List for RefDB (Page 68)
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
refdb-cvs — All cvs checkins go to this list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(88) |
Feb
(50) |
Mar
(36) |
Apr
(9) |
May
(30) |
Jun
(30) |
Jul
(22) |
Aug
(16) |
Sep
(42) |
Oct
(18) |
Nov
(29) |
Dec
(23) |
| 2005 |
Jan
(18) |
Feb
(28) |
Mar
(21) |
Apr
(35) |
May
(62) |
Jun
(22) |
Jul
(5) |
Aug
(40) |
Sep
(98) |
Oct
(81) |
Nov
(51) |
Dec
(62) |
| 2006 |
Jan
(46) |
Feb
(36) |
Mar
(8) |
Apr
(16) |
May
(14) |
Jun
(16) |
Jul
(47) |
Aug
(60) |
Sep
(34) |
Oct
(16) |
Nov
(46) |
Dec
(11) |
| 2007 |
Jan
(16) |
Feb
(13) |
Mar
(58) |
Apr
(32) |
May
(4) |
Jun
(8) |
Jul
(31) |
Aug
(46) |
Sep
(22) |
Oct
(30) |
Nov
(58) |
Dec
(15) |
| 2008 |
Jan
(8) |
Feb
(8) |
Mar
(2) |
Apr
(6) |
May
(3) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2009 |
Jan
(1) |
Feb
(20) |
Mar
(8) |
Apr
(5) |
May
(8) |
Jun
(3) |
Jul
(6) |
Aug
(4) |
Sep
(7) |
Oct
(8) |
Nov
(2) |
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(4) |
Mar
|
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
(5) |
Feb
(5) |
Mar
(13) |
Apr
(3) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(5) |
Nov
|
Dec
(3) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(13) |
| 2014 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
|
Aug
(6) |
Sep
(3) |
Oct
|
Nov
(2) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2022 |
Jan
(9) |
Feb
(16) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:06
|
Update of /cvsroot/refdb/refdb/dsssl/refdb/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/dsssl/refdb/html Modified Files: docbook-refdb.dsl Log Message: use dash as a type spec separator Index: docbook-refdb.dsl =================================================================== RCS file: /cvsroot/refdb/refdb/dsssl/refdb/html/docbook-refdb.dsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -U2 -r1.7 -r1.8 --- docbook-refdb.dsl 4 Nov 2003 23:19:06 -0000 1.7 +++ docbook-refdb.dsl 19 Mar 2004 23:23:11 -0000 1.8 @@ -828,5 +828,5 @@ (attribute-string (normalize "linkend")) 0 - (- (string-length (attribute-string (normalize "linkend"))) 1)))) + (- (string-length (attribute-string (normalize "linkend"))) 2)))) (target (element-with-id linkend)) (xreflabel (attribute-string (normalize "linkend")))) |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:06
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/src Modified Files: backend-dbib.c refdbxp.c Log Message: use dash as a type spec separator Index: backend-dbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -U2 -r1.27 -r1.28 --- backend-dbib.c 19 Jan 2004 23:07:40 -0000 1.27 +++ backend-dbib.c 19 Mar 2004 23:23:11 -0000 1.28 @@ -859,9 +859,9 @@ "YEARONLY"}; - char bibliomset_endstring[5][5] = {"X\">", - "S\">", - "A\">", - "Q\">", - "Y\">"}; + char bibliomset_endstring[6][5] = {"-X\">", + "-S\">", + "-A\">", + "-Q\">", + "-Y\">"}; char role_string[5][13] = {"intext", @@ -976,9 +976,9 @@ /* this loop creates a couple of bibliomset elements which can be targeted from the SGML document by link elements. They provide: - - id="IDxyzX": contains the standard in-text citation - - id="IDxyzS": contains the in-text citation for subsequent citations - - id="IDxyzA": contains the standard author-only in-text citation - - id="IDxyzAS": contains the author-only in-text citation (subsequent) - - id="IDxyzY": contains the year-only in-text citation */ + - id="IDxyz:X": contains the standard in-text citation + - id="IDxyz:S": contains the in-text citation for subsequent citations + - id="IDxyz:A": contains the standard author-only in-text citation + - id="IDxyz:Q": contains the author-only in-text citation (subsequent) + - id="IDxyz:Y": contains the year-only in-text citation */ for (i = 0; i < 5; i++) { @@ -1066,5 +1066,5 @@ /* here the real bibliography contents start */ - sprintf(bmset_buffer, "<bibliomset role=\"bibliography\" id=\"%sB\">", ptr_biblio_info->entry_id); + sprintf(bmset_buffer, "<bibliomset role=\"bibliography\" id=\"%s-B\">", ptr_biblio_info->entry_id); if ((new_ref = mstrcat(*ptr_ref, bmset_buffer, ptr_ref_len, 0)) == NULL) { dbi_result_free(dbires_cit); Index: refdbxp.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbxp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -U2 -r1.6 -r1.7 --- refdbxp.c 18 Mar 2004 21:40:46 -0000 1.6 +++ refdbxp.c 19 Mar 2004 23:23:12 -0000 1.7 @@ -81,5 +81,5 @@ int n_multicit_count = 0; /* this counter is used to create pseudo-unique ID values for multiple citations, i.e. IMXXX */ -char typesep = ':'; /* separator for A,Q,Y etc suffix */ +char typesep = '-'; /* separator for A,Q,Y etc suffix */ /* prototypes */ @@ -646,5 +646,5 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ int write_full(const char* citation, int nis_subseq, int n_citstylespec) { - char modifier[3] = {':', '\0', '\0'}; + char modifier[3] = {'-', '\0', '\0'}; switch (n_citstylespec) { |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:06
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/xsl/refdb/docbk-refdb-xsl/docbk-xhtml Modified Files: docbk-refdb-xhtml.xsl.in Log Message: use dash as a type spec separator Index: docbk-refdb-xhtml.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml/docbk-refdb-xhtml.xsl.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -U2 -r1.5 -r1.6 --- docbk-refdb-xhtml.xsl.in 11 Mar 2004 19:06:17 -0000 1.5 +++ docbk-refdb-xhtml.xsl.in 19 Mar 2004 23:23:12 -0000 1.6 @@ -377,5 +377,5 @@ <xsl:choose> <xsl:when test="@role='MULTIXREF'"> - <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 1)"/> + <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 2)"/> <a href='#{$multitarget}'> <xsl:call-template name="refdb-literal"> @@ -388,5 +388,5 @@ </xsl:when> <xsl:otherwise> - <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 1)"/> + <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 2)"/> <xsl:variable name="ptrtype" select="id(@linkend)/@role"/> <a href='#{$realtarget}'> |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:06
|
Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/xsl/refdb/tei-refdb-xsl/tei-html Modified Files: tei-refdb-html.xsl.in Log Message: use dash as a type spec separator Index: tei-refdb-html.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-html/tei-refdb-html.xsl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -U2 -r1.1 -r1.2 --- tei-refdb-html.xsl.in 22 Feb 2002 07:21:39 -0000 1.1 +++ tei-refdb-html.xsl.in 19 Mar 2004 23:23:12 -0000 1.2 @@ -84,5 +84,5 @@ <xsl:choose> <xsl:when test="@type='MULTIXREF'"> - <xsl:variable name="multitarget" select="substring(following-sibling::ptr/@target, 1, string-length(following-sibling::ptr/@target) - 1)"/> + <xsl:variable name="multitarget" select="substring(following-sibling::ptr/@target, 1, string-length(following-sibling::ptr/@target) - 2)"/> <a href='#{$multitarget}'> <xsl:call-template name="refdb-literal"> @@ -95,5 +95,5 @@ </xsl:when> <xsl:otherwise> - <xsl:variable name="realtarget" select="substring(@target, 1, string-length(@target) - 1)"/> + <xsl:variable name="realtarget" select="substring(@target, 1, string-length(@target) - 2)"/> <xsl:variable name="ptrtype" select="id(@target)/@type"/> <a href='#{$realtarget}'> |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:05
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/xsl/refdb/docbk-refdb-xsl/docbk-html Modified Files: docbk-refdb-html.xsl.in Log Message: use dash as a type spec separator Index: docbk-refdb-html.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-html/docbk-refdb-html.xsl.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -U2 -r1.8 -r1.9 --- docbk-refdb-html.xsl.in 10 Mar 2004 21:45:16 -0000 1.8 +++ docbk-refdb-html.xsl.in 19 Mar 2004 23:23:12 -0000 1.9 @@ -366,5 +366,5 @@ <xsl:choose> <xsl:when test="@role='MULTIXREF'"> - <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 1)"/> + <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 2)"/> <a href='#{$multitarget}'> <xsl:call-template name="refdb-literal"> @@ -377,5 +377,5 @@ </xsl:when> <xsl:otherwise> - <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 1)"/> + <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 2)"/> <xsl:variable name="ptrtype" select="id(@linkend)/@role"/> <a href='#{$realtarget}'> |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:05
|
Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/xsl/refdb/tei-refdb-xsl/tei-fo Modified Files: tei-refdb-fo.xsl.in Log Message: use dash as a type spec separator Index: tei-refdb-fo.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -U2 -r1.1 -r1.2 --- tei-refdb-fo.xsl.in 22 Feb 2002 07:20:02 -0000 1.1 +++ tei-refdb-fo.xsl.in 19 Mar 2004 23:23:12 -0000 1.2 @@ -86,5 +86,5 @@ <xsl:choose> <xsl:when test="@type='MULTIXREF'"> - <xsl:variable name="multitarget" select="substring(following-sibling::ptr/@target, 1, string-length(following-sibling::ptr/@target) - 1)"/> + <xsl:variable name="multitarget" select="substring(following-sibling::ptr/@target, 1, string-length(following-sibling::ptr/@target) - 2)"/> <fo:basic-link internal-destination='{$multitarget}'> <xsl:call-template name="refdb-literal"> @@ -97,5 +97,5 @@ </xsl:when> <xsl:otherwise> - <xsl:variable name="realtarget" select="substring(@target, 1, string-length(@target) - 1)"/> + <xsl:variable name="realtarget" select="substring(@target, 1, string-length(@target) - 2)"/> <xsl:variable name="ptrtype" select="id(@target)/@type"/> <fo:basic-link internal-destination='{$realtarget}'> |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:05
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/xsl/refdb/docbk-refdb-xsl/docbk-fo Modified Files: docbk-refdb-fo.xsl.in Log Message: use dash as a type spec separator Index: docbk-refdb-fo.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-fo/docbk-refdb-fo.xsl.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -U2 -r1.5 -r1.6 --- docbk-refdb-fo.xsl.in 8 Mar 2004 21:07:05 -0000 1.5 +++ docbk-refdb-fo.xsl.in 19 Mar 2004 23:23:12 -0000 1.6 @@ -124,5 +124,5 @@ <xsl:choose> <xsl:when test="@role='MULTIXREF'"> - <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 1)"/> + <xsl:variable name="multitarget" select="substring(following-sibling::xref/@linkend, 1, string-length(following-sibling::xref/@linkend) - 2)"/> <fo:basic-link internal-destination='{$multitarget}'> <xsl:call-template name="refdb-literal"> @@ -135,5 +135,5 @@ </xsl:when> <xsl:otherwise> - <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 1)"/> + <xsl:variable name="realtarget" select="substring(@linkend, 1, string-length(@linkend) - 2)"/> <xsl:variable name="ptrtype" select="id(@linkend)/@role"/> <fo:basic-link internal-destination='{$realtarget}'> |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:04
|
Update of /cvsroot/refdb/refdb/dsssl/refdb/print In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/dsssl/refdb/print Modified Files: docbook-refdb.dsl Log Message: use dash as a type spec separator Index: docbook-refdb.dsl =================================================================== RCS file: /cvsroot/refdb/refdb/dsssl/refdb/print/docbook-refdb.dsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -U2 -r1.4 -r1.5 --- docbook-refdb.dsl 11 Sep 2003 23:59:09 -0000 1.4 +++ docbook-refdb.dsl 19 Mar 2004 23:23:11 -0000 1.5 @@ -687,5 +687,5 @@ (attribute-string (normalize "linkend")) 0 - (- (string-length (attribute-string (normalize "linkend"))) 1)))) + (- (string-length (attribute-string (normalize "linkend"))) 2)))) (target (element-with-id linkend)) (xreflabel (attribute-string (normalize "linkend")))) |
|
From: Markus H. <mho...@us...> - 2004-03-19 23:33:03
|
Update of /cvsroot/refdb/refdb/dsssl/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv496/dsssl/refdb Modified Files: citations.dsl Log Message: use dash as a type spec separator Index: citations.dsl =================================================================== RCS file: /cvsroot/refdb/refdb/dsssl/refdb/citations.dsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -U2 -r1.7 -r1.8 --- citations.dsl 18 Mar 2004 21:40:45 -0000 1.7 +++ citations.dsl 19 Mar 2004 23:23:11 -0000 1.8 @@ -156,5 +156,5 @@ ;; /REFENTRY (let ((strlen (string-length str))) - (if (equal? (substring str (- strlen 2) (- strlen 1)) ":") + (if (equal? (substring str (- strlen 2) (- strlen 1)) "-") (substring str 0 (- strlen 2)) str))) |
|
From: Markus H. <mho...@us...> - 2004-03-18 21:50:57
|
Update of /cvsroot/refdb/refdb/dsssl/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14213/dsssl/refdb Modified Files: citations.dsl Log Message: use separator in front of id type specifier Index: citations.dsl =================================================================== RCS file: /cvsroot/refdb/refdb/dsssl/refdb/citations.dsl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -U2 -r1.6 -r1.7 --- citations.dsl 13 Dec 2002 20:33:49 -0000 1.6 +++ citations.dsl 18 Mar 2004 21:40:45 -0000 1.7 @@ -144,11 +144,11 @@ (define (strip-refdb-suffix str) ;; REFENTRY strip-refdb-suffix - ;; PURP strips off trailing link type specifier in ID + ;; PURP strips off trailing link type specifier and separator in ID ;; DESC - ;; RefDB citations use ID values in the formats "IDnumerical_IDX" - ;; or "IDalphanumeric_citekeyX where ID is the invariant part, + ;; RefDB citations use ID values in the formats "IDnumerical_id:X" + ;; or "IDalphanumeric_citekey:X where ID is the invariant part, ;; followed by a number or a citekey of unlimited length, which is - ;; followed by a one-char specifier for the text which is to be - ;; rendered with the link. Stripping off + ;; followed by a separator and an one-char specifier for the text + ;; which is to be rendered with the link. Stripping off ;; this specifier simplifies downstream processing ;; /DESC @@ -156,6 +156,6 @@ ;; /REFENTRY (let ((strlen (string-length str))) - (if (equal? (string->number (substring str (- strlen 1) strlen)) #f) - (substring str 0 (- strlen 1)) + (if (equal? (substring str (- strlen 2) (- strlen 1)) ":") + (substring str 0 (- strlen 2)) str))) |
|
From: Markus H. <mho...@us...> - 2004-03-18 21:50:57
|
Update of /cvsroot/refdb/refdb/xsl/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14213/xsl/refdb Modified Files: citations.xsl Log Message: use separator in front of id type specifier Index: citations.xsl =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/citations.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -U2 -r1.1 -r1.2 --- citations.xsl 29 Jun 2003 23:10:26 -0000 1.1 +++ citations.xsl 18 Mar 2004 21:40:45 -0000 1.2 @@ -78,5 +78,5 @@ cases the element contents are derived from a linkend attribute. We have to strip off the last character - denoting the type --> + denoting the type and the preceeding separator --> <xsl:choose> <xsl:when test="@role='MULTIXREF'"> @@ -94,5 +94,5 @@ attribute as the element contents --> <xref> - <xsl:value-of select="substring(@linkend,1,string-length(@linkend) -1)"/> + <xsl:value-of select="substring(@linkend,1,string-length(@linkend) -2)"/> </xref> </xsl:otherwise> @@ -141,5 +141,5 @@ cases the element contents are derived from a target attribute. We have to strip off the last character - denoting the type --> + denoting the type and the preceeding separator --> <xsl:choose> <xsl:when test="@type='MULTIXREF'"> @@ -150,5 +150,5 @@ <!-- use the value of the target attribute of the *following* ptr element as the element contents --> - <xsl:value-of select="substring(following-sibling::ptr/@target,1,string-length(following-sibling::ptr/@target) -1)"/> + <xsl:value-of select="substring(following-sibling::ptr/@target,1,string-length(following-sibling::ptr/@target) -2)"/> </xref> </xsl:when> @@ -157,5 +157,5 @@ attribute as the element contents --> <xref> - <xsl:value-of select="substring(@target,1,string-length(@target) -1)"/> + <xsl:value-of select="substring(@target,1,string-length(@target) -2)"/> </xref> </xsl:otherwise> |
|
From: Markus H. <mho...@us...> - 2004-03-18 21:50:34
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14213/src Modified Files: refdbxp.c Log Message: use separator in front of id type specifier Index: refdbxp.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbxp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -U2 -r1.5 -r1.6 --- refdbxp.c 24 Jun 2003 23:53:24 -0000 1.5 +++ refdbxp.c 18 Mar 2004 21:40:46 -0000 1.6 @@ -81,4 +81,5 @@ int n_multicit_count = 0; /* this counter is used to create pseudo-unique ID values for multiple citations, i.e. IMXXX */ +char typesep = ':'; /* separator for A,Q,Y etc suffix */ /* prototypes */ @@ -461,4 +462,9 @@ len = idend - idstring - 1; + /* skip the type suffix separator */ + if (*(idend-2) == typesep) { + len--; + } + /* prevent buffer overflow */ len = (len >= MAX_ATTR_LEN) ? MAX_ATTR_LEN-1 : len; @@ -640,15 +646,15 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ int write_full(const char* citation, int nis_subseq, int n_citstylespec) { - char modifier[2] = {'\0', '\0'}; + char modifier[3] = {':', '\0', '\0'}; switch (n_citstylespec) { case 0: - modifier[0] = (nis_subseq) ? 'S' : 'X'; + modifier[1] = (nis_subseq) ? 'S' : 'X'; break; case 1: - modifier[0] = (nis_subseq) ? 'Q' : 'A'; + modifier[1] = (nis_subseq) ? 'Q' : 'A'; break; case 2: - modifier[0] = 'Y'; + modifier[1] = 'Y'; break; default: |
|
From: Markus H. <mho...@us...> - 2004-03-16 22:48:19
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30281 Modified Files: backend-risx.c Log Message: output PY and Y2 only if year is not nd Index: backend-risx.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -U2 -r1.28 -r1.29 --- backend-risx.c 22 Jan 2004 01:09:40 -0000 1.28 +++ backend-risx.c 16 Mar 2004 22:38:58 -0000 1.29 @@ -1033,10 +1033,12 @@ /* pubyear */ if (type == 1) { - if (get_refdb_pubyear(ptr_rendinfo->dbires, date_buffer) != NULL) { + if (get_refdb_pubyear(ptr_rendinfo->dbires, date_buffer) != NULL + && strcmp(date_buffer, "nd")) { nhave_year = 1; } } else { - if (get_refdb_secyear(ptr_rendinfo->dbires, date_buffer) != NULL) { + if (get_refdb_secyear(ptr_rendinfo->dbires, date_buffer) != NULL + && strcmp(date_buffer, "nd")) { nhave_year = 1; } |
|
From: Markus H. <mho...@us...> - 2004-03-16 22:46:30
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29811 Modified Files: backend-ris.c Log Message: output PY and Y2 only if year is not nd Index: backend-ris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-ris.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -U2 -r1.12 -r1.13 --- backend-ris.c 18 Oct 2003 23:36:34 -0000 1.12 +++ backend-ris.c 16 Mar 2004 22:37:08 -0000 1.13 @@ -478,5 +478,6 @@ /*----------------------------------------------------------------*/ /* pubyear */ - if (get_refdb_pubyear(ptr_rendinfo->dbires, date_buffer) != NULL) { + if (get_refdb_pubyear(ptr_rendinfo->dbires, date_buffer) != NULL + && strcmp(date_buffer, "nd")) { have_pubyear = 1; if (print_field_ris(date_buffer, ptr_rendinfo, "\nPY - ") == NULL) { @@ -508,5 +509,7 @@ /*----------------------------------------------------------------*/ /* date secondary */ - if (get_refdb_secyear(ptr_rendinfo->dbires, date_buffer) != NULL) { + have_pubyear = 0; /* reset */ + if (get_refdb_secyear(ptr_rendinfo->dbires, date_buffer) != NULL + && strcmp(date_buffer, "nd")) { have_pubyear = 1; if (print_field_ris(date_buffer, ptr_rendinfo, "\nY2 - ") == NULL) { |
|
From: Markus H. <mho...@us...> - 2004-03-16 22:45:32
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29275 Modified Files: readris.c Log Message: do not use illegal PY strings Index: readris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/readris.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -U2 -r1.11 -r1.12 --- readris.c 4 Feb 2004 20:58:59 -0000 1.11 +++ readris.c 16 Mar 2004 22:35:55 -0000 1.12 @@ -511,8 +511,6 @@ } else { - /* have otherinfo (strictly speaking this is no valid RIS - but here we should rather try to conserve whatever we find than - try to rectify) */ - strcpy(otherinfo_buffer, string); + /* no legal RIS date */ + otherinfo_buffer[0] = '\0'; year = 0; } |
|
From: Markus H. <mho...@us...> - 2004-03-16 21:13:18
|
Update of /cvsroot/refdb/refdb/cgi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7026 Modified Files: refdb.css Log Message: lowercased the p elements to make the file usable for xhtml Index: refdb.css =================================================================== RCS file: /cvsroot/refdb/refdb/cgi/refdb.css,v retrieving revision 1.2 retrieving revision 1.3 diff -u -U2 -r1.2 -r1.3 --- refdb.css 13 Dec 2002 20:33:29 -0000 1.2 +++ refdb.css 16 Mar 2004 21:03:53 -0000 1.3 @@ -1,14 +1,14 @@ -H1.h1 { font-family: Verdana, Arial, Helvetica, sans-serif; +h1.h1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 140%; visibility: "hidden"; } -H2.id { font-family: Verdana, Arial, Helvetica, sans-serif; +h2.id { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; } -P.title { font-family: Verdana, Arial, Helvetica, sans-serif; +p.title { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 110%; font-weight: bold; } -P.authors { font-family: Verdana, Arial, Helvetica, sans-serif; +p.authors { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; font-weight: bold; @@ -16,34 +16,34 @@ background-color: transparent; } -P.abstract { font-family: Verdana, Arial, Helvetica, sans-serif; +p.abstract { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; font-weight: normal; margin-left: 30px; } -P.citekey { font-family: Verdana, Arial, Helvetica, sans-serif; +p.citekey { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; font-weight: bold; } -P.note { font-family: Verdana, Arial, Helvetica, sans-serif; +p.note { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; font-weight: normal; margin-left: 30px; } -P.m1 { font-family: Verdana, Arial, Helvetica, sans-serif; +p.m1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 70%; font-weight: bold; margin-left: 30px; } -P.m2 { font-family: Verdana, Arial, Helvetica, sans-serif; +p.m2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 70%; font-weight: bold; margin-left: 30px; } -P.m3 { font-family: Verdana, Arial, Helvetica, sans-serif; +p.m3 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 70%; font-weight: bold; margin-left: 30px; } -P.ur { font-family: Verdana, Arial, Helvetica, sans-serif; +p.ur { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 70%; font-weight: normal; |
|
From: Markus H. <mho...@us...> - 2004-03-16 21:12:47
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6892 Modified Files: backend-html.c Log Message: assorted p element fixes Index: backend-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -U2 -r1.24 -r1.25 --- backend-html.c 28 Jan 2004 00:18:14 -0000 1.24 +++ backend-html.c 16 Mar 2004 21:03:27 -0000 1.25 @@ -165,4 +165,5 @@ int errcode; /* receives error code for periodical requests */ int nhave_booktitle = 0; + int nhave_para = 0; char have_page = 0; char have_author = 0; @@ -497,4 +498,14 @@ } } + else { + if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<p>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + clean_request(dbires); + return NULL; + } + else { + *(ptr_rendinfo->ptr_ref) = new_ref; + } + } have_author = 0; @@ -547,10 +558,20 @@ } } - else { + else { /* not book et al. */ + /*----------------------------------------------------------------*/ /* periodical */ + nhave_para = 1; + if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<p>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + return NULL; + } + else { + *(ptr_rendinfo->ptr_ref) = new_ref; + } + /* fetch journal of this article */ if ((item = get_periodical(dbi_result_get_conn(ptr_rendinfo->dbires), date_buffer, NULL, 4, &errcode, my_dbi_result_get_idval(ptr_rendinfo->dbires, "refdb_id"))) != NULL) { - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<p><em class='periodical'>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { + if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<em class='periodical'>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { LOG_PRINT(LOG_WARNING, outomem.text); return NULL; @@ -695,11 +716,14 @@ } } -/* if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</p>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { */ -/* LOG_PRINT(LOG_WARNING, outomem.text); */ -/* return NULL; */ -/* } */ -/* else { */ -/* *(ptr_rendinfo->ptr_ref) = new_ref; */ -/* } */ + + if (nhave_para) { + if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</p>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + return NULL; + } + else { + *(ptr_rendinfo->ptr_ref) = new_ref; + } + } /*----------------------------------------------------------------*/ |
|
From: Markus H. <mho...@us...> - 2004-03-16 21:11:09
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6407 Modified Files: backend.c Log Message: close meta tag for xhtml output Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -U2 -r1.25 -r1.26 --- backend.c 25 Jan 2004 13:17:02 -0000 1.25 +++ backend.c 16 Mar 2004 21:01:48 -0000 1.26 @@ -73,5 +73,10 @@ /* html/xhtml output */ if (*(ptr_rendinfo->ptr_biblio_info->encoding)) { - snprintf(enc_string, PREFS_BUF_LEN+80, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", ptr_rendinfo->ptr_biblio_info->encoding); + if (ptr_rendinfo->ref_format == REFHTML) { + snprintf(enc_string, PREFS_BUF_LEN+80, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", ptr_rendinfo->ptr_biblio_info->encoding); + } + else { /* XHTML, need to close meta tag for XML */ + snprintf(enc_string, PREFS_BUF_LEN+80, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\"/>\n", ptr_rendinfo->ptr_biblio_info->encoding); + } } else { |
|
From: Markus H. <mho...@us...> - 2004-03-11 19:33:08
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1792 Modified Files: docbk-refdb-xhtml.xsl.in Log Message: updated bibliography element to newest DB version Index: docbk-refdb-xhtml.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml/docbk-refdb-xhtml.xsl.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -U2 -r1.4 -r1.5 --- docbk-refdb-xhtml.xsl.in 11 Mar 2004 18:53:46 -0000 1.4 +++ docbk-refdb-xhtml.xsl.in 11 Mar 2004 19:06:17 -0000 1.5 @@ -27,16 +27,24 @@ <!-- we pick only RefDB bibliographies --> <xsl:template match="bibliography[@role='refdb']"> - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + <div class="{name(.)}"> + <xsl:if test="$generate.id.attributes != 0"> + <xsl:attribute name="id"> + <xsl:call-template name="object.id"/> + </xsl:attribute> + </xsl:if> - <div id="{$id}" class="{name(.)}"> <xsl:call-template name="bibliography.titlepage"/> + <xsl:for-each select="bibliomixed"> - <!-- <p><xsl:apply-templates select="." mode="refdb"/></p> --> <xsl:apply-templates select="." mode="refdb"/> </xsl:for-each> - <xsl:call-template name="process.footnotes"/> + + <xsl:if test="not(parent::article)"> + <xsl:call-template name="process.footnotes"/> + </xsl:if> </div> </xsl:template> + <!-- one bibliography entry. We process only the bibliography part and suppress the inline parts --> |
|
From: Markus H. <mho...@us...> - 2004-03-11 19:20:36
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31805 Modified Files: docbk-refdb-xhtml.xsl.in Log Message: added default namespace; removed p elements in favour of the div elements; fixed ADVST typo Index: docbk-refdb-xhtml.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-xhtml/docbk-refdb-xhtml.xsl.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -U2 -r1.3 -r1.4 --- docbk-refdb-xhtml.xsl.in 19 Sep 2003 22:51:23 -0000 1.3 +++ docbk-refdb-xhtml.xsl.in 11 Mar 2004 18:53:46 -0000 1.4 @@ -9,5 +9,5 @@ --> -<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version="1.0"> +<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version="1.0" xmlns="http://www.w3.org/1999/xhtml"> <!-- the original DocBook stylesheets for HTML --> @@ -32,5 +32,6 @@ <xsl:call-template name="bibliography.titlepage"/> <xsl:for-each select="bibliomixed"> - <p><xsl:apply-templates select="." mode="refdb"/></p> + <!-- <p><xsl:apply-templates select="." mode="refdb"/></p> --> + <xsl:apply-templates select="." mode="refdb"/> </xsl:for-each> <xsl:call-template name="process.footnotes"/> @@ -73,5 +74,5 @@ <xsl:when test="$reftype='ADVS'"> <xsl:call-template name="refdb-literal"> - <xsl:with-param name="style" select="$ADVSTURLSTYLE"/> + <xsl:with-param name="style" select="$ADVSURLSTYLE"/> <xsl:with-param name="string"> <xsl:value-of select="."/> |
|
From: Markus H. <mho...@us...> - 2004-03-10 22:11:28
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7020 Modified Files: docbk-refdb-html.xsl.in Log Message: fixed b vs. i mismatch, ADVS typo Index: docbk-refdb-html.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-html/docbk-refdb-html.xsl.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -U2 -r1.7 -r1.8 --- docbk-refdb-html.xsl.in 1 Mar 2004 22:13:53 -0000 1.7 +++ docbk-refdb-html.xsl.in 10 Mar 2004 21:45:16 -0000 1.8 @@ -413,5 +413,5 @@ </xsl:if> <xsl:if test="$style='ITALIC' or $style='ITULINE' or $style='BOLDITALIC' or $style='BOLDITULINE'"> - <xsl:text disable-output-escaping="yes"><u></xsl:text> + <xsl:text disable-output-escaping="yes"><i></xsl:text> </xsl:if> <xsl:if test="$style='BOLD' or $style='BOLDITALIC' or $style='BOLDULINE' or $style='BOLDITULINE'"> @@ -438,5 +438,5 @@ </xsl:if> <xsl:if test="$style='ULINE' or $style='ITULINE' or $style='BOLDULINE' or $style='BOLDITULINE'"> - <xsl:text disable-output-escaping="yes"></i></xsl:text> + <xsl:text disable-output-escaping="yes"></u></xsl:text> </xsl:if> </xsl:template> |
|
From: Markus H. <mho...@us...> - 2004-03-08 21:31:40
|
Update of /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20409 Modified Files: docbk-refdb-fo.xsl.in Log Message: updated to DocBook-xsl 1_65 Index: docbk-refdb-fo.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/docbk-refdb-xsl/docbk-fo/docbk-refdb-fo.xsl.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -U2 -r1.4 -r1.5 --- docbk-refdb-fo.xsl.in 30 Aug 2003 21:26:47 -0000 1.4 +++ docbk-refdb-fo.xsl.in 8 Mar 2004 21:07:05 -0000 1.5 @@ -27,43 +27,66 @@ </xsl:variable> - <fo:block id="{$id}"> - <!-- <xsl:call-template name="component.separator"/> --> - <xsl:call-template name="bibliography.titlepage"/> - <xsl:apply-templates mode="refdb"/> - </fo:block> -</xsl:template> - -<xsl:template match="book/bibliography[@role='refdb']"> - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - <xsl:variable name="master-name"> - <xsl:call-template name="select.pagemaster"/> - </xsl:variable> - - <fo:page-sequence id="{$id}" - hyphenate="{$hyphenate}" - master-name="{$master-name}"> - <xsl:attribute name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:attribute> - <xsl:if test="$double.sided != 0"> - <xsl:attribute name="force-page-count">end-on-even</xsl:attribute> - </xsl:if> - - <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> - </xsl:apply-templates> - <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> - </xsl:apply-templates> - - <fo:flow flow-name="xsl-region-body"> - <xsl:call-template name="bibliography.titlepage"/> + <xsl:choose> + <xsl:when test="not(parent::*) or parent::part or parent::book"> + <xsl:variable name="master-reference"> + <xsl:call-template name="select.pagemaster"/> + </xsl:variable> + + <fo:page-sequence hyphenate="{$hyphenate}" + master-reference="{$master-reference}"> + <xsl:attribute name="language"> + <xsl:call-template name="l10n.language"/> + </xsl:attribute> + <xsl:attribute name="format"> + <xsl:call-template name="page.number.format"/> + </xsl:attribute> + <xsl:if test="$double.sided != 0"> + <xsl:attribute name="initial-page-number">auto-odd</xsl:attribute> + </xsl:if> + <xsl:attribute name="hyphenation-character"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-character'"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="hyphenation-push-character-count"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-push-character-count'"/> + </xsl:call-template> + </xsl:attribute> + <xsl:attribute name="hyphenation-remain-character-count"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:apply-templates select="." mode="running.head.mode"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:apply-templates> + <xsl:apply-templates select="." mode="running.foot.mode"> + <xsl:with-param name="master-reference" select="$master-reference"/> + </xsl:apply-templates> + + <fo:flow flow-name="xsl-region-body"> + <fo:block id="{$id}"> + <xsl:call-template name="bibliography.titlepage"/> + </fo:block> + <xsl:apply-templates select="bibliomixed" mode="refdb"/> + <!-- <xsl:apply-templates/> --> + </fo:flow> + </fo:page-sequence> + </xsl:when> + <xsl:otherwise> + <fo:block id="{$id}" + space-before.minimum="1em" + space-before.optimum="1.5em" + space-before.maximum="2em"> + <xsl:call-template name="bibliography.titlepage"/> + </fo:block> <xsl:apply-templates select="bibliomixed" mode="refdb"/> - </fo:flow> - </fo:page-sequence> + </xsl:otherwise> + </xsl:choose> </xsl:template> + <xsl:template match="bibliomixed" mode="refdb"> <xsl:choose> |
|
From: Markus H. <mho...@us...> - 2004-03-05 23:48:20
|
Update of /cvsroot/refdb/refdb/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26816 Modified Files: refdbxml.in Log Message: added check for match between fo processor and requested output; use fo_classpath for jfor; test for jfor Index: refdbxml.in =================================================================== RCS file: /cvsroot/refdb/refdb/scripts/refdbxml.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -U2 -r1.10 -r1.11 --- refdbxml.in 5 Mar 2004 00:11:18 -0000 1.10 +++ refdbxml.in 5 Mar 2004 23:25:56 -0000 1.11 @@ -34,7 +34,7 @@ fo_classpath="" -# this option is required for the evaluation version of the xep FO processor -# and should point to the installation directory -xep_root="/opt/xep" +# this option is required to find xep.sh which usually is not in your +# PATH. You may leave it empty if xep.sh *is* in your PATH. +xep_path="" # the path of the global configuration file @@ -45,4 +45,8 @@ outformat="html" +# associate fo processors with their output +rtf_generators="jfor" +pdf_generators="fop xep passivetex" + # determine configuration files if [ ! -r "$globalconfig" ] && [ -n "$REFDBLIB" ]; then @@ -134,7 +138,24 @@ # Arguments: input_filename out_filename process_print () { + case $outformat in + rtf ) generators=$rtf_generators;; + pdf ) generators=$pdf_generators;; + esac + + processor_outformat_match=false + for generator in $generators ; do + [ "$generator" = "$fo_processor" ] && processor_outformat_match=true + done + + if [ ${processor_outformat_match} = false ] ; then + echo "Specified FO processor: $fo_processor." + echo "Specified output format: $outformat." + echo "Error: $fo_processor does not produce $outformat output." + exit 1 + fi + case $fo_processor in jfor ) - java -cp "$classpath" ch.codeconsult.jfor.main.CmdLineConverter $1 $2;; + java -cp "$fo_classpath" ch.codeconsult.jfor.main.CmdLineConverter $1 $2;; passivetex ) if [ ! -e $basename.aux ]; then @@ -156,10 +177,5 @@ java -cp "$fo_classpath" org.apache.fop.apps.Fop -fo $1 -pdf $2;; xep ) - # Note the ugly hack (actually a cheat) in the xep command: - # in my evaluation version xep needs to be run from the install - # directory so it can check the license file. If run from any - # other location it needs the -DROOT option set to that - # install directory. Anybody know a way around this? - java -cp "$fo_classpath" com.renderx.xep.XSLDriver -DROOT="$xep_root" -fo $1 -pdf $2;; + ${xep_path}xep.sh -fo $1 -pdf $2;; esac } @@ -225,6 +241,6 @@ # test for valid fo processor # if none specified will be default (passivetex), which is legal -if [ ! $fo_processor = "passivetex" ] && [ ! $fo_processor = "fop" ] && [ ! $fo_processor = "xep" ]; then - echo "specify one of 'passivetex', 'fop', 'xep' with the -f option" +if [ ! $fo_processor = "passivetex" ] && [ ! $fo_processor = "fop" ] && [ ! $fo_processor = "xep" ] && [ ! $fo_processor = "jfor" ]; then + echo "specify one of 'passivetex', 'fop', 'xep', or 'jfor' with the -f option" exit 1; fi |
|
From: Markus H. <mho...@us...> - 2004-03-05 00:39:46
|
Update of /cvsroot/refdb/refdb/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23913 Modified Files: libgen.pl Log Message: fixed ulink handling in DocBook Index: libgen.pl =================================================================== RCS file: /cvsroot/refdb/refdb/scripts/libgen.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -U2 -r1.3 -r1.4 --- libgen.pl 13 Sep 2003 20:14:09 -0000 1.3 +++ libgen.pl 5 Mar 2004 00:18:12 -0000 1.4 @@ -12,5 +12,5 @@ # this is a list of the relevant docbook elements -my @db_elements = ("volumenum", "pagenums", "issuenum", "abbrev", "abstract", "address", "city", "isbn", "issn", "publishername", "ulink"); +my @db_elements = ("volumenum", "pagenums", "issuenum", "abbrev", "abstract", "address", "city", "isbn", "issn", "publishername"); # this hash associates the elements with their styles @@ -103,4 +103,22 @@ } + # ulink needs some special treatment + print "<!-- bibliography types for hyperlinks -->\n\n"; + + print " <xsl:template match=\"ulink\" mode=\"refdb\">\n <xsl:variable name=\"reftype\" select=\"ancestor::bibliomixed/\@role\"/>\n <xsl:variable name=\"target\" select=\"\@url\"/>\n <a href=\'#{\$target}\'>\n <xsl:choose>\n"; + foreach $type (@types) { + my $style = $db_styles{"ulink"}; + print " <xsl:when test=\"\$reftype=\'$type\'\">\n <xsl:call-template name=\"refdb-process-inline\">\n <xsl:with-param name=\"style\" select=\"\$$type$style" . "STYLE\"/>\n </xsl:call-template>\n </xsl:when>\n"; + } + print " </xsl:choose>\n </a>\n </xsl:template>\n\n"; + + # in-text types for the same element + print "<!-- in-text types for ulink -->\n\n"; + + foreach $type (@intext_types) { + my $style = $db_styles{"ulink"}; + print "<xsl:template match=\"ulink\" mode=\"$type\">\n <xsl:call-template name=\"refdb-process-inline\">\n <xsl:with-param name=\"style\" select=\"\$$type$style" . "STYLE\"/>\n </xsl:call-template>\n</xsl:template>\n\n"; + } + # bibliography types for authors, editors, series editors print "<!-- bibliography types for authors, editors, series editors -->\n\n"; |
|
From: Markus H. <mho...@us...> - 2004-03-05 00:32:51
|
Update of /cvsroot/refdb/refdb/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22601 Modified Files: refdbxml.in Log Message: integrated David Nebauers improvements for document processing and configuration Index: refdbxml.in =================================================================== RCS file: /cvsroot/refdb/refdb/scripts/refdbxml.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -U2 -r1.9 -r1.10 --- refdbxml.in 21 Dec 2003 22:58:22 -0000 1.9 +++ refdbxml.in 5 Mar 2004 00:11:18 -0000 1.10 @@ -3,9 +3,14 @@ # Markus Hoenicka <ma...@mh...> 2001-10-10 # $Id$ -# OPTIONS: -s (stylesheet) -h (invoke help), -p (processor), -t (output format) +# OPTIONS: -s (stylesheet) -h (invoke help), -p (xslt processor), +# -t (output format), -f (fo processor) + # relies on these external programs: SUN JRE, tex, passivetex, xmltex, JFOR # at least one of: xerces/xalan, xp/xt, xsltproc, saxon +# and at least one of: passivetex, fop, xep + +# use the refdbxmlrc configuration file to adapt this script to your needs -### start user-customizable section +## initialise variables # location of the stock DocBook and TEI XSL stylesheets htmldb="<docbk_root>/html/docbook.xsl" @@ -16,6 +21,9 @@ fotei="<tei_root>/teixsl-fo/tei.xsl" -# the default processor: xalan, xt, saxon, or xsltproc -processor="xsltproc" +# the default xslt processor: xalan, xt, saxon, saxon-xerces or xsltproc +xslt_processor="xsltproc" + +# the default fo processor: passivetex, fop or xep +fo_processor="passivetex" # the path to the Java class repository. This assumes that all necessary .jar @@ -23,6 +31,13 @@ # might be the simplest solution classpath_root="<classpath_root>" +xslt_classpath="" +fo_classpath="" -### end user-customizable section +# this option is required for the evaluation version of the xep FO processor +# and should point to the installation directory +xep_root="/opt/xep" + +# the path of the global configuration file +globalconfig="<sysconfdir>/refdbxmlrc" # some defaults @@ -30,12 +45,65 @@ outformat="html" -# function definitions +# determine configuration files +if [ ! -r "$globalconfig" ] && [ -n "$REFDBLIB" ]; then + globalconfig=$REFDBLIB/refdbxmlrc +fi +userconfig=$HOME/.refdbxmlrc + +if [ -n "$globalconfig" ] && [ -r "$globalconfig" ]; then + allconfigs=$globalconfig +fi + +if [ -r "$userconfig" ]; then + allconfigs=$allconfigs" "$userconfig +fi + +# read the settings in the configure file(s) +for config in $allconfigs; do + while read refdbvar refdbval; do + if [ -n "$refdbvar" ]; then + if [ $refdbvar = xslt_processor ]; then + xslt_processor=$refdbval + fi + if [ $refdbvar = xslt_classpath ]; then + xslt_classpath=$refdbval + fi + if [ $refdbvar = fo_processor ]; then + fo_processor=$refdbval + fi + if [ $refdbvar = fo_classpath ]; then + fo_classpath=$refdbval + fi + if [ $refdbvar = stylesheet ]; then + stylesheet=$refdbval + fi + if [ $refdbvar = outformat ]; then + outformat=$refdbval + fi + fi + done < $config +done + +# set processor launch commands for functions which follow +# more maintainable (and less ugly -- check out saxon-xerces!) +# note: saxon|saxon-xerces habe command-line options for catalog resolving +case $xslt_processor in + xalan ) xslt_launch="org.apache.xalan.xslt.Process";; + xt ) xslt_launch="com.jclark.xsl.sax.Driver";; + saxon ) xslt_launch="com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u";; + saxon-xerces ) xslt_launch="-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader -y org.apache.xml.resolver.tools.ResolvingXMLReader -r org.apache.xml.resolver.tools.CatalogResolver -u";; + xsltproc ) xslt_launch="xsltproc --catalogs --xinclude";; +esac + + +## function definitions # creates fo output from xml. Arguments: input_filename out_filename process_fo () { - case $processor in - xalan ) java -cp "$classpath" org.apache.xalan.xslt.Process -in $1 -xsl $jfosheet -out $2;; - xt ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jfosheet > $2;; - saxon ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jfosheet;; - xsltproc ) xsltproc --catalogs --xinclude $fosheet $1 > $2;; + case $xslt_processor in + xalan ) java -cp "$xslt_classpath" ${xslt_launch} $1 -xsl $jfosheet -out $2;; + xt ) java -cp "$xslt_classpath" ${xslt_launch} $1 $jfosheet > $2;; + saxon ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jfosheet;; + saxon-xerces ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jfosheet;; + xsltproc ) ${xslt_launch} $fosheet $1 > $2;; esac } @@ -43,9 +111,10 @@ # creates html output from xml. Arguments: input_filename out_filename process_html () { - case $processor in - xalan ) java -cp "$classpath" org.apache.xalan.xslt.Process -in $1 -xsl $jhtmlsheet -out $2;; - xt ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jhtmlsheet > $2;; - saxon ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jhtmlsheet;; - xsltproc ) xsltproc --catalogs --xinclude $htmlsheet $1 > $2;; + case $xslt_processor in + xalan ) java -cp "$xslt_classpath" ${xslt_launch} -in $1 -xsl $jhtmlsheet -out $2;; + xt ) java -cp "$xslt_classpath" ${xslt_launch} $1 $jhtmlsheet > $2;; + saxon ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jhtmlsheet;; + saxon-xerces ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jhtmlsheet;; + xsltproc ) ${xslt_launch} $htmlsheet $1 > $2;; esac } @@ -53,26 +122,63 @@ # creates xhtml output from xml. Arguments: input_filename out_filename process_xhtml () { - case $processor in - xalan ) java -cp "$classpath" org.apache.xalan.xslt.Process -in $1 -xsl $jxhtmlsheet -out $2;; - xt ) java -cp "$classpath" com.jclark.xsl.sax.Driver $1 $jxhtmlsheet > $2;; - saxon ) java -cp "$classpath" com.icl.saxon.StyleSheet -o $2 $1 $jxhtmlsheet;; - xsltproc ) xsltproc --catalogs --xinclude $xhtmlsheet $1 > $2;; + case $xslt_processor in + xalan ) java -cp "$xslt_classpath" ${xslt_launch} -in $1 -xsl $jxhtmlsheet -out $2;; + xt ) java -cp "$xslt_classpath" ${xslt_launch} $1 $jxhtmlsheet > $2;; + saxon ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jxhtmlsheet;; + saxon-xerces ) java -cp "$xslt_classpath" ${xslt_launch} -o $2 $1 $jxhtmlsheet;; + xsltproc ) ${xslt_launch} $xhtmlsheet $1 > $2;; esac } +# creates printable output (pdf|rtf) from fo. +# Arguments: input_filename out_filename +process_print () { + case $fo_processor in + jfor ) + java -cp "$classpath" ch.codeconsult.jfor.main.CmdLineConverter $1 $2;; + passivetex ) + if [ ! -e $basename.aux ]; then + touch $basename.aux + fi + cp $basename.aux $basename.aux.$$ + pdfxmltex $basename.fo + if [ $? -ne 0 ]; then + exit 1 + fi + # the following loop should be fixed to run not more + # than a fixed number of iterations. + until diff --brief $basename.aux $basename.aux.$$; do + cp $basename.aux $basename.aux.$$ + pdfxmltex $basename.fo + done + rm $basename.aux.$$;; + fop ) + java -cp "$fo_classpath" org.apache.fop.apps.Fop -fo $1 -pdf $2;; + xep ) + # Note the ugly hack (actually a cheat) in the xep command: + # in my evaluation version xep needs to be run from the install + # directory so it can check the license file. If run from any + # other location it needs the -DROOT option set to that + # install directory. Anybody know a way around this? + java -cp "$fo_classpath" com.renderx.xep.XSLDriver -DROOT="$xep_root" -fo $1 -pdf $2;; + esac +} + # read the command line options -while getopts ":hp:s:t:" opt; do +while getopts ":hp:f:s:t:" opt; do case $opt in h ) echo "creates formatted output from a DocBook or TEI XML sources" - echo 'usage: refdbxml [-h] [-p processor] [-s stylesheet] [-t outformat] file1 [file2...]' + echo 'usage: refdbxml [-h] [-p xslt_processor] [-f fo_processor ] [-s stylesheet] [-t outformat] file1 [file2...]' echo "Options: -h print this help and exit" - echo " -p specify processor: xalan, xt, saxon, or xsltproc" + echo " -p specify xslt processor: xalan, xt, saxon, or xsltproc" + echo " -f specify fo processor: passivetex, fop or xep" echo " -s stylesheet (the RefDB-generated driver file)" echo " -t select the output format. Possible values are html, xhtml, rtf, pdf." exit 0 ;; - p ) processor=$OPTARG;; + p ) xslt_processor=$OPTARG;; + f ) fo_processor=$OPTARG;; s ) stylesheet=$OPTARG;; t ) outformat=$OPTARG;; - \? ) echo 'usage: refdbxml [-h] [-p processor] [-s stylesheet] [-t outformat] file1 [file2...]' + \? ) echo 'usage: refdbxml [-h] [-p xslt_processor] [-f fo_processor] [-s stylesheet] [-t outformat] file1 [file2...]' echo 'type refdbxml -h to invoke help' exit 1;; @@ -110,9 +216,19 @@ esac -if [ ! $processor = "xalan" ] && [ ! $processor = "xt" ] && [ ! $processor = "xsltproc" ] && [ ! $processor = "saxon" ]; then - echo "specify one of 'xalan', 'xt', 'saxon', 'xsltproc' with the -p option" +# test for valid xslt processor +# default is xsltproc unless configured otherwise +if [ ! $xslt_processor = "xalan" ] && [ ! $xslt_processor = "xt" ] && [ ! $xslt_processor = "xsltproc" ] && [ ! $xslt_processor = "saxon" ] && [ ! $xslt_processor = "saxon-xerces" ]; then + echo "specify one of 'xalan', 'xt', 'saxon', 'saxon-xerces', 'xsltproc' with the -p option" exit 1; fi +# test for valid fo processor +# if none specified will be default (passivetex), which is legal +if [ ! $fo_processor = "passivetex" ] && [ ! $fo_processor = "fop" ] && [ ! $fo_processor = "xep" ]; then + echo "specify one of 'passivetex', 'fop', 'xep' with the -f option" + exit 1; +fi + + # on Win32-cygwin, the native Win32 tools want the DOS path # the variables $jfosheet and jhtmlsheet will receive the appropriate paths @@ -131,4 +247,12 @@ fi +# Set classpath variables to default if not already specified +if ! [ -n "$xslt_classpath" ]; then + xslt_classpath=$classpath +fi +if ! [ -n "$fo_classpath" ]; then + fo_classpath=$classpath +fi + # loop over all files on the command line for filename in $*; do @@ -144,27 +268,20 @@ case $outformat in - rtf ) process_fo $mypath $basename.fo - java -cp "$classpath" ch.codeconsult.jfor.main.CmdLineConverter $basename.fo $basename.rtf;; - html) process_html $mypath $basename.html;; - xhtml) process_xhtml $mypath $basename.xhtml;; - pdf ) process_fo $mypath $basename.fo + rtf ) + process_fo $mypath $basename.fo if [ $? -ne 0 ]; then exit 1 fi - if [ ! -e $basename.aux ]; then - touch $basename.aux - fi - cp $basename.aux $basename.aux.$$ - pdfxmltex $basename.fo + process_print $basename.fo $basename.rtf;; + html) + process_html $mypath $basename.html;; + xhtml) + process_xhtml $mypath $basename.xhtml;; + pdf ) + process_fo $mypath $basename.fo if [ $? -ne 0 ]; then exit 1 fi - # the following loop should be fixed to run not more - # than a fixed number of iterations. - until diff --brief $basename.aux $basename.aux.$$; do - cp $basename.aux $basename.aux.$$ - pdfxmltex $basename.fo - done - rm $basename.aux.$$;; + process_print $basename.fo $basename.pdf;; esac done |
1 message has been excluded from this view by a project administrator.
