Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/TEIC/Stylesheets
Browse files Browse the repository at this point in the history 
Conflicts:
	profiles/default/csv/from.xsl
  • Loading branch information
@sebastianrahtz
sebastianrahtz committed Sep 20, 2014
2 parents 94d3b95 + 79ebfe9 commit a704481
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Test/expected-results/test27.fo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<block text-align="end">2.</block>
</list-item-label>
<list-item-body start-indent="body-start()">
<block font-weight="normal">Donald E. Knuth. Literate Programming, CSLI Lecture Notes 271992. Stanford, California: Center for the Study of Language and Information. 0-937073-80-6 </block>
<block font-weight="normal">Donald E. Knuth. Literate Programming, CSLI Lecture Notes 27 1992. Stanford, California: Center for the Study of Language and Information. 0-937073-80-6 </block>
</list-item-body>
</list-item>
<list-item space-before.optimum="4pt">
Expand Down Expand Up @@ -344,15 +344,15 @@
<block text-align="end">29.</block>
</list-item-label>
<list-item-body start-indent="body-start()">
<block font-weight="normal">Fernando C. N. Pereira. <inline font-style="italic">Grammars and logics of partial information</inline>, 1987. Menlo Park, CA: SRI International. SRI International Technical Note 420. </block>
<block font-weight="normal">Fernando C. N. Pereira. <inline font-style="italic">Grammars and logics of partial information</inline>, 1987. Menlo Park, CA: SRI International. SRI International Technical Note 420. </block>
</list-item-body>
</list-item>
<list-item space-before.optimum="4pt">
<list-item-label end-indent="label-end()" id="FS-BIBL-5">
<block text-align="end">30.</block>
</list-item-label>
<list-item-body start-indent="body-start()">
<block font-weight="normal">Bob Carpenter. <inline font-style="italic">The logic of typed feature structures</inline>, 1992. Cambridge: Cambridge University Press. Cambridge Tracts in Theoretical Computer Science 32. </block>
<block font-weight="normal">Bob Carpenter. <inline font-style="italic">The logic of typed feature structures</inline>, 1992. Cambridge: Cambridge University Press. Cambridge Tracts in Theoretical Computer Science 32. </block>
</list-item-body>
</list-item>
<list-item space-before.optimum="4pt">
Expand Down Expand Up @@ -400,7 +400,7 @@
<block text-align="end">36.</block>
</list-item-label>
<list-item-body start-indent="body-start()">
<block font-weight="normal">Asmus Freytag. <inline font-style="italic">The Unicode Character Property Model</inline>, Unicode Technical Report #232006. &lt;<basic-link external-destination="url(http://www.unicode.org/reports/tr23/)">http://www.unicode.org/reports/tr23/</basic-link>&gt;.</block>
<block font-weight="normal">Asmus Freytag. <inline font-style="italic">The Unicode Character Property Model</inline>, Unicode Technical Report #23 2006. &lt;<basic-link external-destination="url(http://www.unicode.org/reports/tr23/)">http://www.unicode.org/reports/tr23/</basic-link>&gt;.</block>
</list-item-body>
</list-item>
<list-item space-before.optimum="4pt">
Expand Down
8 changes: 4 additions & 4 deletions Test/expected-results/test27.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
\bibitem[Burrows (1987)]{HD-BIBL-2}\label{HD-BIBL-2}John Burrows. \textit{Computation into Criticism: A Study of Jane Austen's Novel and an Experiment in Method}, 1987. Oxford: Clarendon Press.
\bibitem[Calzolari et al. (1990)]{DI-BIBL-2}\label{DI-BIBL-2}N. Calzolari, C. Peters, A. Roventini. \textit{Computational Model of the Dictionary Entry: Preliminary Report}, \textit{Acquilex: Esprit Basic Research Action No. 3030, Six-Month Deliverable}, April 1990. Pisa.
\bibitem[Carlisle et al. (eds.) (2003)]{MATHML}\label{MATHML}David Carlisle, Patrick Ion, Robert Miner, Nico Poppelier (eds.) \textit{Mathematical Markup Language (MathML) Version 2.0 (Second edition)}, 21 October 2003. W3C. <\url{http://www.w3.org/TR/MathML2/}>.
\bibitem[Carpenter (1992)]{FS-BIBL-5}\label{FS-BIBL-5}Bob Carpenter. \textit{The logic of typed feature structures}, 1992. Cambridge: Cambridge University Press. Cambridge Tracts in Theoretical Computer Science 32.
\bibitem[Carpenter (1992)]{FS-BIBL-5}\label{FS-BIBL-5}Bob Carpenter. \textit{The logic of typed feature structures}, 1992. Cambridge: Cambridge University Press. Cambridge Tracts in Theoretical Computer Science 32.
\bibitem[Chartrand and Lesniak (1986)]{GD-BIBL-1}\label{GD-BIBL-1}Gary Chartrand, Linda Lesniak. \textit{Graphs and Digraphs}, 1986. Menlo Park, CA: Wadsworth.
\bibitem[Chatti et al. (2007)]{NH-BIBL-5}\label{NH-BIBL-5}Noureddine Chatti, Suha Kaouk, Sylvie Calabretto, Jean Marie Pinon. ‘MultiX: an XML based formalism to encode multistructured documents’. \textit{Proceedings of Extreme Markup Languages 2007}, 2007. <\url{http://www.idealliance.org/papers/extreme/proceedings/html/2007/Chatti01/EML2007Chatti01.html}>.
\bibitem[Clark (ed.) (1999)]{XSLT}\label{XSLT}James Clark (ed.) \textit{XSL Transformations (XSLT) Version 1.0}, 16 November 1999. W3C. <\url{http://www.w3.org/TR/xslt/}>.
Expand All @@ -358,7 +358,7 @@
\bibitem[Durusau and O'Donnell (2002)]{NH-BIBL-6}\label{NH-BIBL-6}Patrick Durusau, Matthew Brook O'Donnell. ‘Coming down from the trees: next step in the evolution of markup?’. \textit{Proceedings of Extreme Markup Languages 2002}, 2002.
\bibitem[Edwards and Lampert (eds.) (1993)]{TS-BIBL-1}\label{TS-BIBL-1}J. A. Edwards, M. D. Lampert (eds.) \textit{Talking Language: Transcription and Coding of Spoken Discourse}, 1993. Hillsdale, N.J.: Lawrence Erlbaum Associates.
\bibitem[Fought and Van Ess-Dykema]{DI-BIBL-3}\label{DI-BIBL-3}John Fought, Carol Van Ess-Dykema. \textit{Toward an SGML Document Type Definition for Bilingual Dictionaries}, \textit{TEI working paper TEI AIW20}, available from the TEI..
\bibitem[Freytag (2006)]{CH-eg-02}\label{CH-eg-02}Asmus Freytag. \textit{The Unicode Character Property Model}, Unicode Technical Report \#232006. <\url{http://www.unicode.org/reports/tr23/}>.
\bibitem[Freytag (2006)]{CH-eg-02}\label{CH-eg-02}Asmus Freytag. \textit{The Unicode Character Property Model}, Unicode Technical Report \#23 2006. <\url{http://www.unicode.org/reports/tr23/}>.
\bibitem[Gale and Church (1993)]{SA-BIBL-1}\label{SA-BIBL-1}William A. Gale, Kenneth W. Church. ‘Program for aligning sentences in bilingual corpora’. \textit{Computational Linguistics} 1993. 19 pp. 75-102.
\bibitem[Garside et al. (1991)]{AI-BIBL-7}\label{AI-BIBL-7}R. G. Garside, G. N. Leech, G. R. Sampson. \textit{The Computational Analysis of English: a Corpus-Based Approach}, 1991. Oxford: Oxford University Press.
\bibitem[Grosso et al. (eds.) (2003)]{XPTRFMWK}\label{XPTRFMWK}Paul Grosso, Eve Maler, Jonathan Marsh, Norman Walsh (eds.) \textit{XPointer Framework}, 25 March 2003. W3C. <\url{http://www.w3.org/TR/xptr-framework/}>.
Expand All @@ -378,7 +378,7 @@
\bibitem[Johansson et al. (1991)]{TS-BIBL-3}\label{TS-BIBL-3}Stig Johansson, Lou Burnard, Jane Edwards, And Rosta. \textit{Working Paper on Spoken Texts}, \textit{TEI document TEI AI2 W1}, 1991.
\bibitem[Johansson (1994)]{TS-BIBL-2}\label{TS-BIBL-2}Stig Johansson. ‘Encoding a Corpus in Machine-Readable Form’. Sue Atkins, Antonio Zampolli (eds.) \textit{Computational Approaches to the Lexicon: An Overview}, 1994. Oxford: Oxford University Press.
\bibitem[Kay (ed.) (2007)]{XSLT2}\label{XSLT2}Michael Kay (ed.) \textit{XSL Transformations (XSLT) Version 2.0}, 23 January 2007. W3C. <\url{http://www.w3.org/TR/xslt20/}>.
\bibitem[Knuth (1992)]{KNUTH}\label{KNUTH}Donald E. Knuth. Literate Programming, CSLI Lecture Notes 271992. Stanford, California: Center for the Study of Language and Information. 0-937073-80-6
\bibitem[Knuth (1992)]{KNUTH}\label{KNUTH}Donald E. Knuth. Literate Programming, CSLI Lecture Notes 27 1992. Stanford, California: Center for the Study of Language and Information. 0-937073-80-6
\bibitem[Kytö and Rissanen (1988)]{CC-BIBL-1}\label{CC-BIBL-1}M. Kytö, M. Rissanen. ‘The Helsinki Corpus of English Texts’. M. Kytö, O. Ihalainen, M. Rissanen (eds.) \textit{Corpus Linguistics: hard and soft}, 1988. Amsterdam: Rodopi.
\bibitem[Langendoen and Simons (1995)]{FS-BIBL-01}\label{FS-BIBL-01}D. Terence Langendoen, Gary F. Simons. ‘A rationale for the TEI recommendations for feature-structure markup,’. \textit{Computers and the Humanities} 1995. 29 pp. 167-195.
\bibitem[Leech and Garside (1991)]{AI-BIBL-5}\label{AI-BIBL-5}G. N. Leech, R. G. Garside. ‘Running a Grammar Factory’. S. Johansson, A.-B. Stenstrøm (eds.) \textit{English Computer Corpora: Selected Papers and Research Guide}, 1991. Berlin, New York: de Gruyter. Mouton. pp. pp. 15-32..
Expand All @@ -389,7 +389,7 @@
\bibitem[Marshall (1983)]{AI-BIBL-6}\label{AI-BIBL-6}I. Marshall. ‘Choice of Grammatical Word Class without Global Syntactic Analysis: Tagging Words in the LOB Corpus’. \textit{Computers and the Humanities} 1983. 17 pp. 139-50.
\bibitem[Mattheier et al. (eds.) (1988)]{CO-BIBL-1}\label{CO-BIBL-1}Klaus Mattheier, Ulrich Ammon, Peter Trudgill (eds.) \textit{Sociolinguistics}, \textit{Soziolinguistik}, \textit{An international handbook of the science of language and society}, \textit{Ein internationales Handbuch zur Wissenschaft von Sprache und Gesellschaft}, 1988. Berlin, New York: De Gruyter. I pp. 271 and 274.
\bibitem[Parkes (1969)]{PARKES}\label{PARKES}M. B. Parkes. \textit{English Cursive Book Hands 1250–1500}, 1969. Oxford: Clarendon Press.
\bibitem[Pereira (1987)]{FS-BIBL-1}\label{FS-BIBL-1}Fernando C. N. Pereira. \textit{Grammars and logics of partial information}, 1987. Menlo Park, CA: SRI International. SRI International Technical Note 420.
\bibitem[Pereira (1987)]{FS-BIBL-1}\label{FS-BIBL-1}Fernando C. N. Pereira. \textit{Grammars and logics of partial information}, 1987. Menlo Park, CA: SRI International. SRI International Technical Note 420.
\bibitem[Petty (1977)]{PETTY}\label{PETTY}A. G. Petty. \textit{English literary hands from Chaucer to Dryden}, 1977. London: Edward Arnold. pp. 22–25.
\bibitem[Phillips and Davis (eds.) (2006)]{CH-BIBL-4}\label{CH-BIBL-4}Addison Phillips, Mark Davis (eds.) \textit{Tags for Identifying Languages}, 2006. IETF. RFC 4646
\bibitem[Phillips and Davis (eds.) (2006)]{CH-BIBL-5}\label{CH-BIBL-5}Addison Phillips, Mark Davis (eds.) \textit{Matching of Language Tags}, 2006. IETF. RFC 4647
Expand Down
5 changes: 4 additions & 1 deletion common/common_core.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ of this software, even if advised of the possibility of such damage.
(ancestor::tei:biblStruct or ancestor::tei:biblFull)">
<xsl:call-template name="makeText">
<xsl:with-param name="letters">
<xsl:text> </xsl:text>
</xsl:with-param>
</xsl:call-template>
</xsl:if>
Expand All @@ -628,7 +629,9 @@ of this software, even if advised of the possibility of such damage.
</xsl:call-template>
<xsl:if test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
<xsl:call-template name="makeText">
<xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
<xsl:with-param name="letters">
<xsl:text> </xsl:text>
</xsl:with-param>
</xsl:call-template>
</xsl:if>
</xsl:when>
Expand Down

0 comments on commit a704481

Please sign in to comment.