diff options
| author | Karl Berry <karl@freefriends.org> | 2015-09-05 21:59:55 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2015-09-05 21:59:55 +0000 |
| commit | b87d035e26c6d72bc073ee6a6cf5459e444afbd2 (patch) | |
| tree | 5aa6279ca6f2335c878cdd952ad7d6bcf1eefcd5 | |
| parent | dd9af8d6468a7f432235669fdbc5dbb7283b3bf8 (diff) | |
babel-greek (4sep15)
git-svn-id: svn://tug.org/texlive/trunk@38296 c570f23f-e606-0410-a88d-b1316a301751
17 files changed, 592 insertions, 1117 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-greek/README b/Master/texmf-dist/doc/generic/babel-greek/README index a8a5507bcbb..c131ca2cc7e 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README +++ b/Master/texmf-dist/doc/generic/babel-greek/README @@ -12,13 +12,12 @@ Babel support for the Greek language and script :Abstract: Babel-greek is a contributed package providing support for the Greek language and script via the Babel_ system. + The file ``greek.ldf`` provides options for monotonic + (single-diacritic) and polytonic (multiple-diacritic) modes of + writing. -In 1997, Apostolos Syropoulos added support for the Greek language to the -"babel" package. The file ``greek.ldf`` provides options for monotonic -(single-diacritic) and polytonic (multiple-diacritic) modes of writing. - -Since 2013-07-19, babel-greek supports also Unicode-aware TeX engines -(XeTeX/LuaTeX). + Since 2013-07-19, babel-greek supports also Unicode-aware TeX + engines (XeTeX/LuaTeX). News ---- @@ -52,6 +51,11 @@ News .. Use named macros instead of non-standard short macros for psili and dasia in the string definitions. 1.9c 2014-10-21 Fix dummy hyphenation language names (patch Ulrike Fischer). +1.9d 2015-09-04 Remove `grsymb` (macros for Greek symbols). + This package is outdated and obsoleted by greek-fontenc_ + (reported by Claudio Beccari). +.. Unicode uc/lc corrections now in greek-fontenc + (polyglossia's ``xgreek-fixes.def`` has bugs). ===== ============ ============================================================ @@ -68,9 +72,6 @@ Files Athenian Numerals. `<grmath.dtx>`_; `<grmath.pdf>`_ Greek log-like Operators. -`<grsymb.dtx>`_; `<grsymb.pdf>`_ - Macros for Greek symbols (obsoleted by the greek-fontenc_ package). - `<test-greek.pdf>`_; `<test-greek.tex>`_ Tests and Examples for 8-bit TeX. `<test-unicode-greek.pdf>`_; `<test-unicode-greek.tex>`_ @@ -79,20 +80,16 @@ Files Tests and Examples for XeTeX/LuaTeX with LGR 8-bit fonts. `<usage.pdf>`_; `<usage.tex>`_ - Description of the Latin transliteration for Greek defined by the - LGR font encoding. + Description of the `LGR Latin transliteration`_. Requirements ------------ -The "babel-greek" package requires the babel_ base package and parts of the -greek-fontenc_ package. The greek-inputenc_ package is recommended when -using 8-bit TeX engines. - -Use with XeTeX/LuaTeX requires also ``xgreek-fixes.def`` from polyglossia_ -for correct up/downcasing. +The "babel-greek" package requires the babel_ base package and font +definition files from the greek-fontenc_ package. The greek-inputenc_ +package is recommended when using 8-bit TeX engines. Typesetting Greek texts requires `Greek text fonts`_. @@ -134,7 +131,9 @@ or :: \usepackage[greek.polutoniko,english]{babel} Similarly, the attribute "ancient" selects the ancient Greek language -variant. +variant. + +For details see `<babel-greek.pdf>`_ and the babel_ documentation. With XeTeX/LuaTeX, load fontspec_ before babel_, so that babel-greek can set up the Unicode font encoding for use with Greek, e.g. :: @@ -144,11 +143,14 @@ set up the Unicode font encoding for use with Greek, e.g. :: \setsansfont{Linux Biolinum O} \usepackage[greek,english]{babel} -For details see `<babel-greek.pdf>`_ and the babel_ documentation. +Note, that the default font used with XeTeX/LuaTeX (Latin Modern) misses most +Greek letters. Warnings about missing charcters are only written to the log +file, not the console output! + -Literal input of Greek characters is possible with the greek-inputenc_ -package or with XeTeX or LuaTeX. For the Latin transliteration provided by -the LGR font encoding, see `<usage.pdf>`_ and the example files provided with +Input of Greek characters is possible as literal characters (with the +greek-inputenc_ package or with XeTeX or LuaTeX) or the `LGR Latin +transliteration`_. See `<usage.pdf>`_ and the example files provided with greek-fontenc_. Greek text fonts @@ -172,7 +174,7 @@ is facilitated by the substitutefont_ package. LGR Latin Transliteration ------------------------- -The LGR font encoding generates Greek characters via an ASCII +The LGR font encoding allows input of Greek characters via an ASCII transliteration. This enables simple input with a Latin keyboard. Characters with diacritics are selected by ligature definitions in the font (see `<usage.pdf>`_). diff --git a/Master/texmf-dist/doc/generic/babel-greek/README.html b/Master/texmf-dist/doc/generic/babel-greek/README.html index 7220d0dc343..7237a48f60a 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/README.html +++ b/Master/texmf-dist/doc/generic/babel-greek/README.html @@ -1,644 +1,409 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> <title>babel-greek</title> -<meta name="copyright" content="© 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms, © 2013 Günter Milde" /> <style type="text/css"> -/* -:Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $ -:Copyright: This stylesheet has been placed in the public domain. - -Default cascading style sheet for the HTML output of Docutils. - -See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to -customize this style sheet. -*/ - -/* used to remove borders from tables and images */ -.borderless, table.borderless td, table.borderless th { - border: 0 } - -table.borderless td, table.borderless th { - /* Override padding for "table.docutils td" with "! important". - The right padding separates the table cells. */ - padding: 0 0.5em 0 0 ! important } - -.first { - /* Override more specific margin styles with "! important". */ - margin-top: 0 ! important } - -.last, .with-subtitle { - margin-bottom: 0 ! important } - -.hidden { - display: none } - +/* Minimal style sheet for the HTML output of Docutils. */ +/* */ +/* :Author: Günter Milde, based on html4css1.css by David Goodger */ +/* :Id: $Id: minimal.css 7893 2015-05-11 15:38:58Z milde $ */ +/* :Copyright: © 2015 Günter Milde. */ +/* :License: Released under the terms of the `2-Clause BSD license`_, */ +/* in short: */ +/* */ +/* Copying and distribution of this file, with or without modification, */ +/* are permitted in any medium without royalty provided the copyright */ +/* notice and this notice are preserved. */ +/* */ +/* This file is offered as-is, without any warranty. */ +/* */ +/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */ + +/* This CSS2.1_ stylesheet defines rules for Docutils elements without */ +/* HTML equivalent. It is required to make the document semantic visible. */ +/* */ +/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */ +/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */ + +/* Figure/table alignment */ +.align-left { text-align: left; } +.align-right { text-align: right; } +.align-center { clear: both; text-align: center;} + +/* titles */ +h1.title, p.subtitle { + text-align: center; +} +p.admonition-title, +p.topic-title, +p.sidebar-title, +p.rubric, +p.system-message-title { + font-weight: bold; +} +h1 + p.subtitle, +h1 + p.section-subtitle { + font-size: 1.6em; +} +h2 + p.section-subtitle { font-size: 1.28em; } +p.subtitle, +p.section-subtitle, +p.sidebar-subtitle { + font-weight: bold; + margin-top: -0.5em; +} +p.sidebar-title, +p.rubric { + font-size: larger; +} +p.rubric { color: maroon; } a.toc-backref { - text-decoration: none ; - color: black } - -blockquote.epigraph { - margin: 2em 5em ; } - -dl.docutils dd { - margin-bottom: 0.5em } - -object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] { - overflow: hidden; + color: black; + text-decoration: none; } + +/* Warnings, Errors */ +div.caution p.admonition-title, +div.attention p.admonition-title, +div.danger p.admonition-title, +div.error p.admonition-title, +div.warning p.admonition-title, +div.system-messages h1, +div.error, +span.problematic, +p.system-message-title { + color: red; +} + +/* inline literals */ +span.docutils.literal { + font-family: monospace; + white-space: pre-wrap; } +/* do not wraph at hyphens and similar: */ +.literal > span.pre { white-space: nowrap; } -/* Uncomment (and remove this text!) to get bold-faced definition list terms -dl.docutils dt { - font-weight: bold } -*/ - -div.abstract { - margin: 2em 5em } +/* Lists */ -div.abstract p.topic-title { - font-weight: bold ; - text-align: center } - -div.admonition, div.attention, div.caution, div.danger, div.error, -div.hint, div.important, div.note, div.tip, div.warning { - margin: 2em ; - border: medium outset ; - padding: 1em } - -div.admonition p.admonition-title, div.hint p.admonition-title, -div.important p.admonition-title, div.note p.admonition-title, -div.tip p.admonition-title { - font-weight: bold ; - font-family: sans-serif } - -div.attention p.admonition-title, div.caution p.admonition-title, -div.danger p.admonition-title, div.error p.admonition-title, -div.warning p.admonition-title, .code .error { - color: red ; - font-weight: bold ; - font-family: sans-serif } - -/* Uncomment (and remove this text!) to get reduced vertical space in - compound paragraphs. -div.compound .compound-first, div.compound .compound-middle { - margin-bottom: 0.5em } - -div.compound .compound-last, div.compound .compound-middle { - margin-top: 0.5em } -*/ +/* compact and simple lists: no margin between items */ +.simple li, .compact li, +.simple ul, .compact ul, +.simple ol, .compact ol, +.simple > li p, .compact > li p, +dl.simple > dd, dl.compact > dd { + margin-top: 0; + margin-bottom: 0; +} -div.dedication { - margin: 2em 5em ; - text-align: center ; - font-style: italic } +/* Table of Contents */ +div.topic.contents { margin: 0; } +ul.auto-toc { + list-style-type: none; + padding-left: 1.5em; } + +/* Enumerated Lists */ +ol.arabic { list-style: decimal } +ol.loweralpha { list-style: lower-alpha } +ol.upperalpha { list-style: upper-alpha } +ol.lowerroman { list-style: lower-roman } +ol.upperroman { list-style: upper-roman } + +dt span.classifier { font-style: italic } +dt span.classifier:before { + font-style: normal; + margin: 0.5em; + content: ":"; +} -div.dedication p.topic-title { - font-weight: bold ; - font-style: normal } +/* Field Lists and drivatives */ +/* bold field name, content starts on the same line */ +dl.field-list > dt, +dl.option-list > dt, +dl.docinfo > dt, +dl.footnote > dt, +dl.citation > dt { + font-weight: bold; + clear: left; + float: left; + margin: 0; + padding: 0; + padding-right: 0.5em; +} +/* Offset for field content (corresponds to the --field-name-limit option) */ +dl.field-list > dd, +dl.option-list > dd, +dl.docinfo > dd { + margin-left: 9em; /* ca. 14 chars in the test examples */ +} +/* start field-body on a new line after long field names */ +dl.field-list > dd > *:first-child, +dl.option-list > dd > *:first-child +{ + display: inline-block; + width: 100%; + margin: 0; +} +/* field names followed by a colon */ +dl.field-list > dt:after, +dl.docinfo > dt:after { + content: ":"; +} -div.figure { - margin-left: 2em ; - margin-right: 2em } +/* Bibliographic Fields (docinfo) */ +pre.address { font: inherit; } +dd.authors > p { margin: 0; } -div.footer, div.header { - clear: both; - font-size: smaller } +/* Option Lists */ +dl.option-list { margin-left: 40px; } +dl.option-list > dt { font-weight: normal; } +span.option { white-space: nowrap; } -div.line-block { - display: block ; - margin-top: 1em ; - margin-bottom: 1em } +/* Footnotes and Citations */ +dl > dt.label { font-weight: normal; } +dt.label > span.fn-backref { margin: 0.2em; } +dt.label > span.fn-backref > a { font-style: italic; } +/* Line Blocks */ +div.line-block { display: block; } div.line-block div.line-block { - margin-top: 0 ; - margin-bottom: 0 ; - margin-left: 1.5em } - -div.sidebar { - margin: 0 0 0.5em 1em ; - border: medium outset ; - padding: 1em ; - background-color: #ffffee ; - width: 40% ; - float: right ; - clear: right } - -div.sidebar p.rubric { - font-family: sans-serif ; - font-size: medium } - -div.system-messages { - margin: 5em } - -div.system-messages h1 { - color: red } - -div.system-message { - border: medium outset ; - padding: 1em } - -div.system-message p.system-message-title { - color: red ; - font-weight: bold } - -div.topic { - margin: 2em } - -h1.section-subtitle, h2.section-subtitle, h3.section-subtitle, -h4.section-subtitle, h5.section-subtitle, h6.section-subtitle { - margin-top: 0.4em } - -h1.title { - text-align: center } - -h2.subtitle { - text-align: center } - -hr.docutils { - width: 75% } - -img.align-left, .figure.align-left, object.align-left { - clear: left ; - float: left ; - margin-right: 1em } - -img.align-right, .figure.align-right, object.align-right { - clear: right ; - float: right ; - margin-left: 1em } + margin-top: 0; + margin-bottom: 0; + margin-left: 40px; +} -img.align-center, .figure.align-center, object.align-center { +/* Images and Figures */ +img.align-left, +.figure.align-left, +object.align-left { + display: block; + margin-right: auto; +} +img.align-center, +.figure.align-center, +object.align-center { display: block; margin-left: auto; margin-right: auto; } - -.align-left { - text-align: left } - -.align-center { - clear: both ; - text-align: center } - -.align-right { - text-align: right } - +img.align-right, +.figure.align-right, +object.align-right { + display: block; + margin-left: auto; +} /* reset inner alignment in figures */ -div.align-right { - text-align: inherit } - -/* div.align-center * { */ -/* text-align: left } */ - -ol.simple, ul.simple { - margin-bottom: 1em } - -ol.arabic { - list-style: decimal } - -ol.loweralpha { - list-style: lower-alpha } - -ol.upperalpha { - list-style: upper-alpha } - -ol.lowerroman { - list-style: lower-roman } - -ol.upperroman { - list-style: upper-roman } - -p.attribution { - text-align: right ; - margin-left: 50% } - -p.caption { - font-style: italic } - -p.credits { - font-style: italic ; - font-size: smaller } - -p.label { - white-space: nowrap } - -p.rubric { - font-weight: bold ; - font-size: larger ; - color: maroon ; - text-align: center } - -p.sidebar-title { - font-family: sans-serif ; - font-weight: bold ; - font-size: larger } - -p.sidebar-subtitle { - font-family: sans-serif ; - font-weight: bold } - -p.topic-title { - font-weight: bold } - -pre.address { - margin-bottom: 0 ; - margin-top: 0 ; - font: inherit } - -pre.literal-block, pre.doctest-block, pre.math, pre.code { - margin-left: 2em ; - margin-right: 2em } - -pre.code .ln { color: grey; } /* line numbers */ -pre.code, code { background-color: #eeeeee } -pre.code .comment, code .comment { color: #5C6576 } -pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } -pre.code .literal.string, code .literal.string { color: #0C5404 } -pre.code .name.builtin, code .name.builtin { color: #352B84 } -pre.code .deleted, code .deleted { background-color: #DEB0A1} -pre.code .inserted, code .inserted { background-color: #A3D289} - -span.classifier { - font-family: sans-serif ; - font-style: oblique } - -span.classifier-delimiter { - font-family: sans-serif ; - font-weight: bold } - -span.interpreted { - font-family: sans-serif } - -span.option { - white-space: nowrap } - -span.pre { - white-space: pre } - -span.problematic { - color: red } - -span.section-subtitle { - /* font-size relative to parent (h1..h6 element) */ - font-size: 80% } +div.align-right { text-align: inherit } -table.citation { - border-left: solid 1px gray; - margin-left: 1px } - -table.docinfo { - margin: 2em 4em } - -table.docutils { - margin-top: 0.5em ; - margin-bottom: 0.5em } - -table.footnote { - border-left: solid 1px black; - margin-left: 1px } - -table.docutils td, table.docutils th, -table.docinfo td, table.docinfo th { - padding-left: 0.5em ; - padding-right: 0.5em ; - vertical-align: top } +/* Admonitions and System Messages */ +div.admonition, +div.system-message, +div.sidebar{ + margin: 40px; + border: medium outset; + padding-right: 1em; + padding-left: 1em; +} -table.docutils th.field-name, table.docinfo th.docinfo-name { - font-weight: bold ; - text-align: left ; - white-space: nowrap ; - padding-left: 0 } +/* Sidebar */ +div.sidebar { + width: 30%; + max-width: 26em; + float: right; + clear: right; +} -/* "booktabs" style (no vertical lines) */ -table.docutils.booktabs { - border: 0px; - border-top: 2px solid; - border-bottom: 2px solid; - border-collapse: collapse; +/* Text Blocks */ +div.topic, +pre.literal-block, +pre.doctest-block, +pre.math, +pre.code { + margin-right: 40px; + margin-left: 40px; } -table.docutils.booktabs * { - border: 0px; +pre.code .ln { color: gray; } /* line numbers */ + +/* Tables */ +table { border-collapse: collapse; } +td, th { + border-style: solid; + border-color: silver; + padding: 0 1ex; + border-width: thin; } -table.docutils.booktabs th { - border-bottom: thin solid; +td > p:first-child, th > p:first-child { margin-top: 0; } +td > p, th > p { margin-bottom: 0; } + +table > caption { text-align: left; + margin-bottom: 0.25em } -h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, -h4 tt.docutils, h5 tt.docutils, h6 tt.docutils { - font-size: 100% } - -ul.auto-toc { - list-style-type: none } +table.borderless td, table.borderless th { + border: 0; + padding: 0; + padding-right: 0.5em /* separate table cells */ +} </style> <style type="text/css"> -/* html4css2.css: Cascading style sheet for Docutils' html4strict writer. */ -/* */ -/* :Author: Günter Milde */ -/* :Copyright: © 2009 Günter Milde. */ -/* Released without warranties or conditions of any kind */ -/* under the terms of the Apache License, Version 2.0 */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* This stylesheet supplements the Docutils standard style 'html4css1.css'. */ -/* It uses CSS 2.1 elements (supported by up-to-date versions of popular */ -/* browsers). */ - -/* General rules */ -/* ============= */ - +/* CSS31_ style sheet for the output of Docutils HTML writers. */ +/* Rules for easy reading and pre-defined style variants. */ +/* */ +/* :Author: Günter Milde, based on html4css1.css by David Goodger */ +/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */ +/* :Copyright: © 2015 Günter Milde. */ +/* :License: Released under the terms of the `2-Clause BSD license`_, */ +/* in short: */ +/* */ +/* Copying and distribution of this file, with or without modification, */ +/* are permitted in any medium without royalty provided the copyright */ +/* notice and this notice are preserved. */ +/* */ +/* This file is offered as-is, without any warranty. */ +/* */ +/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */ +/* .. _CSS3: http://www.w3.org/TR/CSS3 */ + + +/* Document Structure */ +/* ****************** */ + +/* "page layout" */ body { padding: 0 5%; margin: 8px 0; +} +div.document { line-height:1.3; - /* http://ilovetypography.com/2008/02/28/a-guide-to-web-typography/ - recommends "line-spacing that’s at least 140% of your text size" */ counter-reset: table; /* counter-reset: figure; */ -} - -/* avoid long lines --> better reading */ -/* OTOH: lines should not be too short because of missing hyphenation, */ -div.document { - max-width: 45em; + /* avoid long lines --> better reading */ + /* OTOH: lines should not be too short because of missing hyphenation, */ + max-width: 50em; margin: auto; } -/* separate items except for compact lists */ -dl > dd { +/* Sections */ + +/* Transitions */ + +hr.docutils { + width: 80%; + margin-top: 1em; margin-bottom: 1em; + clear: both; } -.compact li, .compact p, .compact ul, .compact ol -dl.simple > dd, .simple li, .simple p, .simple ul, .simple ol { - margin-top: 0; - margin-bottom: 0; -/* background: magenta; */ + +/* Paragraphs */ +/* ========== */ + +/* vertical space (parskip) */ +p, ol, ul, dl, +div.line-block, +table{ + margin-top: 0.5em; + margin-bottom: 0.5em; } -dl.simple, dl.compact, dl.simple > dd, dl.compact > dd { - margin-top: 0; - margin-bottom: 0; -/* background: lightgreen; */ +h1, h2, h3, h4, h5, h6, +dl > dd { + margin-bottom: 0.5em; } -/* space around paragraphs */ -dl > dd p:first-child, td > p { - margin: 0; -} +/* Lists */ +/* ========== */ -/* Sidebar */ -/* ------- */ +/* Definition Lists */ -div.sidebar { - margin-right: -5%; -} +dl > dd p:first-child { margin-top: 0; } +/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */ +/* dl > dd p:last-child { margin-bottom: 0; } */ -/* Special definition lists */ -/* ======================== */ +/* lists nested in definition lists */ +/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */ +dd > ul:only-child, dd > ol:only-child { padding-left: 1em; } -/* bold definition term on the same line as the label */ -dl.field-list > dt, dl.option-list > dt, dl.docinfo > dt, -dl.footnote > dt, dl.citation > dt, dl.description > dt { +/* Description Lists */ +/* styled like in most dictionaries, encyclopedias etc. */ +dl.description > dt { + font-weight: bold; clear: left; float: left; margin: 0; padding: 0; padding-right: 0.5em; - font-weight: bold; } -/* except for these */ -dl.option-list > dt, dl.footnote > dt { - font-weight: normal; -} - - /* Field Lists */ -/* ----------- */ - -/* field names followed by a colon */ -dl.field-list > dt:after, dl.docinfo > dt:after { - content: ":"; -} - -/* Offset for field content (corresponds to the --field-name-limit option) */ -dl.field-list > dd { - margin-left: 9em; /* ca. 14 chars in the test examples */ - padding-left: 0.5em; -} - -/* start field-body on a new line after long field names */ -dl.field-list > dd p { - width: 100%; -/* display: inline-block; */ -/* background: yellow; */ -} - -dl.field-list > dd > p:first-child, -/* dl.field-list > dd > ol:first-child, */ -/* dl.field-list > dd > ul:first-child, */ -dl.field-list > dd > dl:first-child { - display: inline-block; -} - -/* field-list variants:: */ /* example for custom field-name width */ dl.field-list.narrow > dd { margin-left: 5em; } - -/* start field-body on same line after long field names */ +/* run-in: start field-body on same line after long field names */ dl.field-list.run-in > dd p { display: block; } -/* wrap or truncate long field names */ -dl.field-list.fix-labelwidth > dt { - width: 8em; /* set to dl.field-list > dd margin-left - padding-left */ - overflow: hidden; -} -dl.field-list.fix-labelwidth > dd:after { - /* a "stopper" to prevent next dd floating up too far */ - content: ''; - display: block; - clear: left; -} - -/* docinfo */ +/* Bibliographic Fields */ -dl.docinfo > dd { - margin-left: 8em; -/* margin-bottom: 0.5em; */ +/* generally, bibliographic fields use special definition list dl.docinfo */ +/* but dedication and abstract are placed into "topic" divs */ +div.abstract p.topic-title { + text-align: center; } - - -/* option list */ - -dl.option-list { - margin-left: 1em; - padding-left: 0; +div.dedication { + margin: 2em 5em; + text-align: center; + font-style: italic; } - -dl.option-list > dd { - margin-left: 8em; - /* margin-bottom: 0.5em; */ +div.dedication p.topic-title { + font-style: normal; } -/* start description on a new line after long options */ -dl.option-list > dd p { - width: 100%; - display: inline-block; +/* Citations */ +dl.citation dt.label { + font-weight: bold; } - -/* footnotes */ - -a.footnote-reference, a.fn-backref { - text-decoration: inherit; /* do not underline footnote links */ +span.fn-backref { + font-weight: normal; } -dl.footnote { - /* line on the left */ - padding-left: 1ex; - border-left: solid; - border-left-width: thin; - /* border-color: black; */ -} +/* Text Blocks */ +/* ============ */ -/* paragraph on same line as backrefs */ -dd > em { -/* background: green; */ - float: left; - margin-right: 1ex +/* Literal Blocks */ +pre.literal-block, pre.doctest-block, +pre.math, pre.code { + margin-left: 1.5em; + margin-right: 1.5em } +/* Block Quotes */ -/* -Ordered List (Enumeration) --------------------------- - -Use counters to replace the deprecated start attribute. Make sure the -resulting list resembles the list-style 'outside' with a hanging indent. -*/ - -/* New ordered list: reset counter, suppress the default label */ -ol, ol.arabic, ol.loweralpha, ol.upperalpha, -ol.lowerroman, ol.upperroman { - counter-reset: item; - list-style: none -} - -/* Set the negative indent of the list label as feature of the list item */ -ol > li { - text-indent: -40px; /* Mozillas default indent */ +blockquote, +div.topic { + margin-left: 1.5em; + margin-right: 1.5em } -/* reset for child elements */ -ol > li > * { - text-indent: 0px; - text-indent: 0; +blockquote > table, +div.topic > table { margin-top: 0; - /* background: lightgreen; */ + margin-bottom: 0; } - -/* Label */ -ol > li:before { - /* increment and typeset counter(s), */ - counter-increment: item; - content: counter(item) "."; - /* display next to the content (aligned top-right), */ - display: inline-block; +blockquote p.attribution, +div.topic p.attribution { text-align: right; - vertical-align: top; - /* sum must match ol>li {text-indent:} (40px is Mozillas default) */ - width: 35px; - padding-right: 5px; -/* background: yellow; */ + margin-left: 20%; } -/* The list item's first line starts next to the label, without indent */ -ol > li > p:first-child, -ol > li > ol:first-child, -ol > li > ul:first-child, -ol > li > dl:first-child { - display: inline-block; - /* background: lightblue; */ -} - -/* default separator variants */ -ol.loweralpha > li:before { - content: counter(item, lower-alpha) ")"; -} -ol.upperalpha > li:before { - content: counter(item, upper-alpha) "."; -} -ol.lowerroman > li:before { - content: "(" counter(item, lower-roman) ")"; -} -ol.upperroman > li:before { - content: counter(item, upper-roman) ")"; -} -/* nested counters (1, 1.1, 1.1.1, etc) */ -/* nested enumerated lists "inherit" the class attribute, other lists not */ -ol.nested > li:before, ol.nested ol > li:before { - content: counters(item, ".") " "; -} +/* Tables */ +/* ====== */ -/* lists nested in definition list */ - -dd > ul, dd > ol { - padding-left: 0pt; -} - -/* TODO: prefix, suffix? */ - -/* smaller font for super- and subscripts */ -/* sub, sup {font-size: 70%;} */ /* Mozilla default is `smaller` */ - - -/* Tables */ -/* ====== */ - -/* margins and borders for "normal" tables */ -table { -/* background: magenta; */ - margin-top: 1em ; - margin-bottom: 1em; -/* border-style: outset; */ - border-style: solid; - border-color: silver; - border-width: thin; - border-collapse: collapse; -} -blockquote > table { - margin-top: 0em ; - margin-bottom: 0em; -} - -td, th { - border-style: solid; - border-width: thin; - border-color: silver; - /* text-align: left; */ - padding: 0 1ex; -} - -td > p:first-child, th > p:first-child { - margin-top: 0; -} -td > p, th > p { - margin-bottom: 0; -} - -/* no borders for "borderless" tables */ -table.borderless, table.borderless * { - border-style: none; -} +/* th { vertical-align: bottom; } */ /* "booktabs" style (no vertical lines) */ table.booktabs { @@ -647,7 +412,6 @@ table.booktabs { border-bottom: 2px solid; border-collapse: collapse; } - table.booktabs * { border: 0; } @@ -656,95 +420,154 @@ table.booktabs th { text-align: left; } -table > caption { - text-align: left; - margin-bottom: 0.25em -/* padding: 2em 0 1em 0; */ -} - -/* numbered tables*/ +/* numbered tables (counter defined in div.document) */ table.numbered > caption:before { - counter-increment: table; /* defined/re-set in body */ + counter-increment: table; content: "Table " counter(table) ": "; font-weight: bold; } +/* Explicit Markup Blocks */ +/* ====================== */ -/* literal text - ------------ -*/ -/* whitespace and wrapping in inline literals */ -/* possible values: normal, nowrap, pre, pre-wrap, pre-line */ -tt.literal { - white-space: pre-wrap; +/* Footnotes and Citations */ +/* ----------------------- */ + +/* line on the left */ +dl.footnote { + padding-left: 1ex; + border-left: solid; + border-left-width: thin; } -/* /* compensate for initial line-break (which is literal with XHTML 1.1) */ */ -/* pre.literal-block, pre.doctest-block { */ -/* margin-top: 0em ; */ -/* } */ +/* Directives */ +/* ---------- */ -/* Table of Contents */ +/* Body Elements */ +/* ~~~~~~~~~~~~~ */ -/* don't indent like a topic */ -div.topic.contents { - margin: 0; +/* Images and Figures */ +img.align-left, +.figure.align-left, +object.align-left { + clear: left; + float: left; + margin-right: 1em +} +img.align-right, +.figure.align-right, +object.align-right { + clear: right; + float: right; + margin-left: 1em } -/* div.topic.contents ul { */ -/* list-style: none; */ -/* } */ +/* Stop floating sidebars, images and figures at section level 1,2,3 */ +h1, h2, h3 { clear: both; } + +/* Sidebar */ -div.topic.contents a { - text-decoration: none; /* no underline for links */ +/* Move into the margin. In a layout with fixed margins, */ +/* it can be moved into the margin completely. */ +div.sidebar { + width: 30%; + max-width: 26em; + margin-left: 1em; + margin-right: -5.5%; + background-color: #ffffee ; } -/* section numbers */ +/* Code */ + +pre.code, code { background-color: #eeeeee } +pre.code .ln { color: gray; } /* line numbers */ +/* basic highlighting: for a complete scheme, see */ +/* http://docutils.sourceforge.net/sandbox/stylesheets/ */ +pre.code .comment, code .comment { color: #5C6576 } +pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } +pre.code .literal.string, code .literal.string { color: #0C5404 } +pre.code .name.builtin, code .name.builtin { color: #352B84 } +pre.code .deleted, code .deleted { background-color: #DEB0A1} +pre.code .inserted, code .inserted { background-color: #A3D289} + +/* Math */ +/* styled separately (see math.css for math-output=HTML) */ + +/* Epigraph */ +/* Highlights */ +/* Pull-Quote */ +/* Compound Paragraph */ +/* Container */ + +/* can be styled in a custom stylesheet */ -span.sectnum { - padding-right: 1ex; +/* Document Header and Footer */ + +div.footer, div.header { + clear: both; + font-size: smaller; } -/* admonitions */ +/* Inline Markup */ +/* ============= */ + +/* Emphasis */ +/* em */ +/* Strong Emphasis */ +/* strong */ +/* Interpreted Text */ +/* span.interpreted */ +/* Title Reference */ +/* cite */ +/* Inline Literals */ +/* possible values: normal, nowrap, pre, pre-wrap, pre-line */ +/* span.docutils.literal { white-space: pre-wrap; } */ -/* no padding for top and bottom */ -div.admonition, div.attention, div.caution, div.danger, div.error, -div.hint, div.important, div.note, div.tip, div.warning { - padding: 0px 1em } +/* Hyperlink References */ +a { text-decoration: none; } + +/* External Targets */ +/* span.target.external */ +/* Internal Targets */ +/* span.target.internal */ +/* Footnote References */ +/* a.footnote-reference */ +/* Citation References */ +/* a.citation-reference */ </style> </head> <body> <div class="document" id="babel-greek"> <h1 class="title">babel-greek</h1> -<h2 class="subtitle" id="babel-support-for-the-greek-language-and-script">Babel support for the Greek language and script</h2> +<p class="subtitle" id="babel-support-for-the-greek-language-and-script">Babel support for the Greek language and script</p> <dl class="docinfo simple"> <dt class="copyright">Copyright</dt> <dd class="copyright">© 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms, © 2013 Günter Milde</dd> -<dt>Licence</dt> -<dd><p>This work may be distributed and/or modified under the +<dt class="licence">Licence</dt> +<dd class="licence"><p>This work may be distributed and/or modified under the conditions of the <a class="reference external" href="http://www.latex-project.org/lppl.txt">LaTeX Project Public License</a>, either -version 1.3 of this license or any later version.</p> +version 1.3 of this license or any later version.</p> </dd> </dl> <div class="abstract topic"> <p class="topic-title first">Abstract</p> <p>Babel-greek is a contributed package providing support for the Greek language and script via the <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a> system.</p> +<p>The file <span class="docutils literal">greek.ldf</span> provides options for monotonic +(single-diacritic) and polytonic (multiple-diacritic) modes of +writing.</p> +<p>Since 2013-07-19, babel-greek supports also Unicode-aware TeX +engines (XeTeX/LuaTeX).</p> </div> -<p>In 1997, Apostolos Syropoulos added support for the Greek language to the -“babel” package. The file <tt class="literal">greek.ldf</tt> provides options for monotonic -(single-diacritic) and polytonic (multiple-diacritic) modes of writing.</p> -<p>Since 2013-07-19, babel-greek supports also Unicode-aware TeX engines -(XeTeX/LuaTeX).</p> <div class="section" id="news"> <h1>News</h1> <table class="borderless"> <colgroup> -<col width="6%" /> -<col width="16%" /> -<col width="78%" /> +<col style="width: 6%" /> +<col style="width: 16%" /> +<col style="width: 78%" /> </colgroup> <tbody> <tr><td><p>1.4</p></td> @@ -753,8 +576,8 @@ Greek language and script via the <a class="reference external" href="http://www </tr> <tr><td><!-- --> </td> -<td> </td> -<td><p>The encoding definition file <tt class="literal">lgrenc.def</tt> moved to the +<td></td> +<td><p>The encoding definition file <span class="docutils literal">lgrenc.def</span> moved to the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package.</p></td> </tr> <tr><td><p>1.5</p></td> @@ -763,17 +586,17 @@ Greek language and script via the <a class="reference external" href="http://www </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>LICR macros in string definitions,</p></td> </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>LGR font encoding not used with XeTeX/LuaTeX,</p></td> </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>input “xgreek-fixes.def” from <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> with Xe/LuaTeX.</p></td> </tr> <tr><td><p>1.5a</p></td> @@ -790,12 +613,12 @@ Greek language and script via the <a class="reference external" href="http://www </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>Do not auto-load euenc.def with XeTeX/LuaTeX.</p></td> </tr> <tr><td><p>1.7a</p></td> <td><p>2013-09-13</p></td> -<td><p>Fix bug <a class="reference external" href="http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4360">babel/4360</a>: spurious <tt class="literal">\fi</tt>.</p></td> +<td><p>Fix bug <a class="reference external" href="http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4360">babel/4360</a>: spurious <span class="docutils literal">\fi</span>.</p></td> </tr> <tr><td><p>1.7b</p></td> <td><p>2013-10-01</p></td> @@ -803,17 +626,17 @@ Greek language and script via the <a class="reference external" href="http://www </tr> <tr><td><p>1.8</p></td> <td><p>2013-12-02</p></td> -<td><p>Rename <tt class="literal">greek.dtx</tt> to <tt class="literal"><span class="pre">babel-greek</span></tt> so that <a class="reference external" href="http://www.ctan.org/pkg/texdoc">texdoc</a> +<td><p>Rename <span class="docutils literal">greek.dtx</span> to <span class="docutils literal"><span class="pre">babel-greek</span></span> so that <a class="reference external" href="http://www.ctan.org/pkg/texdoc">texdoc</a> shows the right documentation.</p></td> </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>Compatibility with Xe/LuaTeX in Unicode and 8-bit mode.</p></td> </tr> <tr><td><p>1.8a</p></td> <td><p>2013-12-03</p></td> -<td><p>Set <tt class="literal">\encodingdefault</tt> in <tt class="literal">\greekscript</tt> to fix +<td><p>Set <span class="docutils literal">\encodingdefault</span> in <span class="docutils literal">\greekscript</span> to fix Greek in footnotes etc. with document language Greek.</p></td> </tr> <tr><td><p>1.9</p></td> @@ -831,7 +654,7 @@ patterns: Patch by Claudio Beccari. Bugfix for Makeuppercase</p></td> </tr> <tr><td><!-- --> </td> -<td> </td> +<td></td> <td><p>Use named macros instead of non-standard short macros for psili and dasia in the string definitions.</p></td> </tr> @@ -839,14 +662,26 @@ for psili and dasia in the string definitions.</p></td> <td><p>2014-10-21</p></td> <td><p>Fix dummy hyphenation language names (patch Ulrike Fischer).</p></td> </tr> +<tr><td><p>1.9d</p></td> +<td><p>2015-09-04</p></td> +<td><p>Remove <cite>grsymb</cite> (macros for Greek symbols). +This package is outdated and obsoleted by <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> +(reported by Claudio Beccari).</p></td> +</tr> +<tr><td><!-- --> +</td> +<td></td> +<td><p>Unicode uc/lc corrections now in greek-fontenc +(polyglossia’s <span class="docutils literal"><span class="pre">xgreek-fixes.def</span></span> has bugs).</p></td> +</tr> </tbody> </table> </div> <div class="section" id="files"> <h1>Files</h1> -<dl class="docutils"> +<dl class="simple"> <dt><a class="reference external" href="babel-greek.ins">babel-greek.ins</a>; <a class="reference external" href="babel-greek.pdf">babel-greek.pdf</a></dt> -<dd><p>Source of the language definition file <tt class="literal">greek.ldf</tt> for use with <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a>.</p> +<dd><p>Source of the language definition file <span class="docutils literal">greek.ldf</span> for use with <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a>.</p> </dd> <dt><a class="reference external" href="athnum.dtx">athnum.dtx</a>; <a class="reference external" href="athnum.pdf">athnum.pdf</a></dt> <dd><p>Athenian Numerals.</p> @@ -854,9 +689,6 @@ for psili and dasia in the string definitions.</p></td> <dt><a class="reference external" href="grmath.dtx">grmath.dtx</a>; <a class="reference external" href="grmath.pdf">grmath.pdf</a></dt> <dd><p>Greek log-like Operators.</p> </dd> -<dt><a class="reference external" href="grsymb.dtx">grsymb.dtx</a>; <a class="reference external" href="grsymb.pdf">grsymb.pdf</a></dt> -<dd><p>Macros for Greek symbols (obsoleted by the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package).</p> -</dd> <dt><a class="reference external" href="test-greek.pdf">test-greek.pdf</a>; <a class="reference external" href="test-greek.tex">test-greek.tex</a></dt> <dd><p>Tests and Examples for 8-bit TeX.</p> </dd> @@ -867,18 +699,15 @@ for psili and dasia in the string definitions.</p></td> <dd><p>Tests and Examples for XeTeX/LuaTeX with LGR 8-bit fonts.</p> </dd> <dt><a class="reference external" href="usage.pdf">usage.pdf</a>; <a class="reference external" href="usage.tex">usage.tex</a></dt> -<dd><p>Description of the Latin transliteration for Greek defined by the -LGR font encoding.</p> +<dd><p>Description of the <a class="reference internal" href="#lgr-latin-transliteration">LGR Latin transliteration</a>.</p> </dd> </dl> </div> <div class="section" id="requirements"> <h1>Requirements</h1> -<p>The “babel-greek” package requires the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> base package and parts of the -<a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package. The <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> package is recommended when -using 8-bit TeX engines.</p> -<p>Use with XeTeX/LuaTeX requires also <tt class="literal"><span class="pre">xgreek-fixes.def</span></tt> from <a class="reference external" href="http://www.ctan.org/pkg/polyglossia">polyglossia</a> -for correct up/downcasing.</p> +<p>The “babel-greek” package requires the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> base package and font +definition files from the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package. The <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> +package is recommended when using 8-bit TeX engines.</p> <p>Typesetting Greek texts requires <a class="reference internal" href="#greek-text-fonts">Greek text fonts</a>.</p> <p>Plain TeX is currently not supported. Patches are welcome.</p> </div> @@ -889,38 +718,37 @@ manager.</p> <p>Otherwise, make sure LaTeX can find the required files:</p> <ul class="simple"> <li><p>Download and unpack <cite>babel-greek.zip</cite>.</p></li> -<li><p>Run <tt class="literal">tex</tt> or <tt class="literal">latex</tt> on the batch file <tt class="literal"><span class="pre">babel-greek.ins</span></tt>.</p></li> -<li><p>Move all files ending in <tt class="literal">.ldf</tt> or <tt class="literal">.sty</tt> into a directory searched by +<li><p>Run <span class="docutils literal">tex</span> or <span class="docutils literal">latex</span> on the batch file <span class="docutils literal"><span class="pre">babel-greek.ins</span></span>.</p></li> +<li><p>Move all files ending in <span class="docutils literal">.ldf</span> or <span class="docutils literal">.sty</span> into a directory searched by TeX.</p></li> -<li><p>To produce the documentation, run the file <tt class="literal">usage.tex</tt> and all files -ending in <tt class="literal">.dtx</tt> through LaTeX.</p></li> +<li><p>To produce the documentation, run the file <span class="docutils literal">usage.tex</span> and all files +ending in <span class="docutils literal">.dtx</span> through LaTeX.</p></li> </ul> </div> <div class="section" id="usage"> <h1>Usage</h1> <p>Pass the “greek” option to babel:</p> -<pre class="literal-block">\usepackage[greek]{babel} -</pre> +<pre class="literal-block">\usepackage[greek]{babel}</pre> <p>For polytonic Greek, set the language attribute “polutoniko”:</p> <pre class="literal-block">\usepackage[greek]{babel} -\languageattribute{greek}{polutoniko} -</pre> +\languageattribute{greek}{polutoniko}</pre> <p>or</p> -<pre class="literal-block">\usepackage[greek.polutoniko,english]{babel} -</pre> +<pre class="literal-block">\usepackage[greek.polutoniko,english]{babel}</pre> <p>Similarly, the attribute “ancient” selects the ancient Greek language variant.</p> +<p>For details see <a class="reference external" href="babel-greek.pdf">babel-greek.pdf</a> and the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> documentation.</p> <p>With XeTeX/LuaTeX, load <a class="reference external" href="http://www.ctan.org/pkg/fontspec">fontspec</a> before <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a>, so that babel-greek can set up the Unicode font encoding for use with Greek, e.g.</p> <pre class="literal-block">\usepackage{fontspec} \setmainfont{Linux Libertine O} \setsansfont{Linux Biolinum O} -\usepackage[greek,english]{babel} -</pre> -<p>For details see <a class="reference external" href="babel-greek.pdf">babel-greek.pdf</a> and the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> documentation.</p> -<p>Literal input of Greek characters is possible with the <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> -package or with XeTeX or LuaTeX. For the Latin transliteration provided by -the LGR font encoding, see <a class="reference external" href="usage.pdf">usage.pdf</a> and the example files provided with +\usepackage[greek,english]{babel}</pre> +<p>Note, that the default font used with XeTeX/LuaTeX (Latin Modern) misses most +Greek letters. Warnings about missing charcters are only written to the log +file, not the console output!</p> +<p>Input of Greek characters is possible as literal characters (with the +<a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> package or with XeTeX or LuaTeX) or the <a class="reference internal" href="#lgr-latin-transliteration">LGR Latin +transliteration</a>. See <a class="reference external" href="usage.pdf">usage.pdf</a> and the example files provided with <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>.</p> </div> <div class="section" id="greek-text-fonts"> @@ -940,38 +768,38 @@ is facilitated by the <a class="reference external" href="http://www.ctan.org/pk </div> <div class="section" id="lgr-latin-transliteration"> <h1>LGR Latin Transliteration</h1> -<p>The LGR font encoding generates Greek characters via an ASCII +<p>The LGR font encoding allows input of Greek characters via an ASCII transliteration. This enables simple input with a Latin keyboard. Characters with diacritics are selected by ligature definitions in the font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <p>The following ASCII characters are converted to Greek symbols:</p> <table> <colgroup> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> -<col width="4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> +<col style="width: 4%" /> </colgroup> <tbody> <tr><td><p>A</p></td> @@ -992,7 +820,7 @@ font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <td><p>P</p></td> <td><p>R</p></td> <td><p>S</p></td> -<td> </td> +<td></td> <td><p>T</p></td> <td><p>U</p></td> <td><p>F</p></td> @@ -1018,7 +846,7 @@ font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <td><p>Π</p></td> <td><p>Ρ</p></td> <td><p>Σ</p></td> -<td> </td> +<td></td> <td><p>Τ</p></td> <td><p>Υ</p></td> <td><p>Φ</p></td> @@ -1083,68 +911,68 @@ font (see <a class="reference external" href="usage.pdf">usage.pdf</a>).</p> <p>Accent symbols and punctuation:</p> <table> <colgroup> -<col width="29%" /> -<col width="9%" /> -<col width="3%" /> -<col width="38%" /> -<col width="14%" /> -<col width="7%" /> +<col style="width: 29%" /> +<col style="width: 9%" /> +<col style="width: 3%" /> +<col style="width: 38%" /> +<col style="width: 14%" /> +<col style="width: 7%" /> </colgroup> <tbody> <tr><td><p>tonos</p></td> -<td><p><tt class="literal">'</tt></p></td> +<td><p><span class="docutils literal">'</span></p></td> <td><p>ά</p></td> <td><p>semicolon</p></td> -<td><p><tt class="literal">;</tt></p></td> +<td><p><span class="docutils literal">;</span></p></td> <td><p>·</p></td> </tr> <tr><td><p>varia</p></td> <td><p>`</p></td> <td><p>ὰ</p></td> <td><p>question mark</p></td> -<td><p><tt class="literal">?</tt></p></td> +<td><p><span class="docutils literal">?</span></p></td> <td><p>;</p></td> </tr> <tr><td><p>perispomeni</p></td> -<td><p><tt class="literal">~</tt></p></td> +<td><p><span class="docutils literal">~</span></p></td> <td><p>ᾶ</p></td> <td><p>left apostrophe</p></td> <td><p>` `</p></td> <td><p>‘</p></td> </tr> <tr><td><p>dasia</p></td> -<td><p><tt class="literal"><</tt></p></td> +<td><p><span class="docutils literal"><</span></p></td> <td><p>ἁ</p></td> <td><p>right apostrophe</p></td> -<td><p><tt class="literal">''</tt></p></td> +<td><p><span class="docutils literal">''</span></p></td> <td><p>’</p></td> </tr> <tr><td><p>psili</p></td> -<td><p><tt class="literal">></tt></p></td> +<td><p><span class="docutils literal">></span></p></td> <td><p>ἀ</p></td> <td><p>left quotation mark</p></td> -<td><p><tt class="literal">((</tt></p></td> +<td><p><span class="docutils literal">((</span></p></td> <td><p>»</p></td> </tr> <tr><td><p>ypogegrammeni</p></td> -<td><p><tt class="literal">|</tt></p></td> +<td><p><span class="docutils literal">|</span></p></td> <td><p>ᾳ</p></td> <td><p>right quotation mark</p></td> -<td><p><tt class="literal">))</tt></p></td> +<td><p><span class="docutils literal">))</span></p></td> <td><p>»</p></td> </tr> <tr><td><p>dialytika</p></td> -<td><p><tt class="literal">"</tt></p></td> +<td><p><span class="docutils literal">"</span></p></td> <td><p>ϊ</p></td> <td><p>zero width non-joiner</p></td> <td><p>v</p></td> -<td> </td> +<td></td> </tr> </tbody> </table> <p>A major drawback of the LGR transliteration is that you cannot access Latin letters and some symbols if LGR is the active font encoding (e.g. in -documents or parts of documents given the <cite>Babel</cite> language <tt class="literal">greek</tt>). This +documents or parts of documents given the <cite>Babel</cite> language <span class="docutils literal">greek</span>). This means that for every Latin-written word or acronym an explicit language-switch is required. This problem can only be solved via a font-encoding comprising both Latin and Greek like the hypothetical T7 or diff --git a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf Binary files differindex f0a8db01501..3cf6b3ea3f8 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/babel-greek.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf b/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf Binary files differdeleted file mode 100644 index 8a5340135c4..00000000000 --- a/Master/texmf-dist/doc/generic/babel-greek/grsymb.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf Binary files differindex 08d7d645111..bd91e24c29a 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex index ceeb1c58860..5498dfc96bd 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-greek.tex @@ -1,4 +1,3 @@ - \documentclass[a4paper]{article} \usepackage[LGR,T1]{fontenc} @@ -59,7 +58,7 @@ \maketitle The babel option ``greek'' activates the support for the Greek language -defined in the file ``greek.ldf'' (source ``greek.dtx''). +defined in the file \texttt{greek.ldf} (source \texttt{greek.dtx}). \section{Language Switch} @@ -109,7 +108,7 @@ commands do not start a new paragraph: \greekscript Φίλων τοῦ \textlatin{TeX} (ΕΦΤ) -- \latintext Friends (\ensuregreek{F\'ilwn}) of TeX. -``greek.ldf'' has some workarounds, so that macros relying on Latin +\texttt{greek.ldf} has some workarounds, so that macros relying on Latin characters in the ``right'' positions keep working. We test, that these definitions do not overwrite the selection of pre-composed characters for ``copyright'' and ``registered trade mark'' by ``textcomp'' (try copy and @@ -141,9 +140,9 @@ the left (instead of above) and drop them in uppercase, e.g. \ensuregreek{μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}}. Upcased letters with diacritics keep the dialytika. This is implemented for -all input variants of diacritics with dialytika. (Babel has ``composite -command'' definitions to ensure this also works for accent characters -"upcased" to the charcter No 159.) +all input variants of diacritics with dialytika. (\texttt{greek.ldf} has +\emph{composite command} definitions to ensure this also works for accent +characters "upcased" to the charcter No 159.) \foreignlanguage{greek}{\"i \"'i \"`i \"~i \'"i \`"i \~"i \"u \"\'u \"\`u \"\~u @@ -157,20 +156,20 @@ command'' definitions to ensure this also works for accent characters Tonos and dasia mark a \emph{hiatus} (break-up of a diphtong) if placed on the first vowel of a diphtong -(\ensuregreek{\'ai, \'au, \'ei, \'>ai, \>'au, \>'ei}). +(\ensuregreek{\'ai, \'au, \'ei, \'>ai, \'>au, \'>ei}). A dialytika must be placed on the second vowel if they are dropped: -(\ensuregreek{\MakeUppercase{\'ai, \'au, \'ei, \'>ai, \>'au, \>'ei}}). +(\ensuregreek{\MakeUppercase{\'ai, \'au, \'ei, \'>ai, \'>au, \'>ei}}). \selectlanguage{greek} % from teubner: άυλος/ΑΫΛΟΣ \'aulos $\mapsto$ \MakeUppercase{\'aulos}, -\>'aulos $\mapsto$ \MakeUppercase{\>'aulos}, +\'>aulos $\mapsto$ \MakeUppercase{\'>aulos}, % from http://diacritics.typo.cz/index.php?id=69 μάινα -> ΜΑΪΝΑ m\'aina $\mapsto$ \MakeUppercase{m\'aina}, % from http://de.wikipedia.org/wiki/Neugriechische_Orthographie#Das_Trema % κέικ, ἀυπνία/αϋπνία k\'eik, $\mapsto$ \MakeUppercase{k\'eik} -\>aupn\'ia $\mapsto$ \MakeUppercase{\>aupn\'ia} +\accpsili{a}upn\'ia $\mapsto$ \MakeUppercase{\accpsili{a}upn\'ia} \selectlanguage{english} There are several alternative styles for the capitalized sub-iota. @@ -183,9 +182,9 @@ for non-standard assignments: ', ", `, >, <, | $\mapsto$ \MakeUppercase{', ", `, >, <, |} \selectlanguage{english} -The uppercase of the zero-width space at the place of ``v`` is the -Dasia-Oxia accent (\ensuregreek{\MakeUppercase{v}}), the glyph at the -position of ``V``. However, the uccode of v is not changed (any more): +The uppercase of the zero-width space at the place of ``v'' is kept to point +to the glyph at the position of ``V'', the Dasia-Oxia accent +(\ensuregreek{\MakeUppercase{v}}): \begin{quotation} greek-1.3i 2000/10/02: uc code of `v' is switched to V diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf Binary files differindex 56057149e3d..ef53262ad06 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex index bf33940e5cc..05bfd5e740e 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-greek.tex @@ -1,6 +1,7 @@ \documentclass[a4paper]{article} % \usepackage{textcomp} -\usepackage{hyperref,bookmark} +\usepackage[colorlinks=true,linkcolor=blue]{hyperref} +\usepackage{bookmark} \usepackage{parskip} \usepackage{fontspec} @@ -10,7 +11,7 @@ % \setmainfont{Droid Serif} % only monotonic Greek (subset of Greek and Coptic) \usepackage[greek,english]{babel} -\languageattribute{greek}{polutoniko} +% \languageattribute{greek}{polutoniko} \languageattribute{greek}{ancient} \message{greek-euenc ist} @@ -52,21 +53,11 @@ specified as first argument. This is intended for short text parts like \section{Font Encoding} -Switching to a font encoding supporting the Greek script is possible without -switching the Babel language using the declarations \verb|\greekscript| (no -switch if the current encoding supports Greek script) or \verb|\greektext| -(always switch to LGR). The corresponding macros \verb|\ensuregreek| and -\verb|\textgreek| typeset their argument in a Greek-supporting font encoding. - -With XeTeX or LuaTeX, declaring the LGR font encoding is optional. -The macros \verb|\greektext| and \verb|\textgreek| are -only defined, if the LGR font encoding is declared via the \texttt{fontenc} -package \emph{before} loading babel (see test-unicode-lgr.tex). - Every language switch to \texttt{greek} calls the \verb|\extrasgreek| command which in turn calls \verb|\greekscript| to ensure a Greek-supporting -font encoding (LGR, EU1, or EU2). (For customization, you can add to or -redefine the \verb|\extrasgreek| command.) +font encoding (LGR, EU1, or EU2). Under XeTeX/LuaTeX the font encoding +normally just remains Unicode (EU1 or EU2). (For customization, you can add +to or redefine the \verb|\extrasgreek| command.) The LGR font encoding does not support Latin characters. Therefore, the Babel core defines the declaration \verb|\latintext| and the command @@ -78,10 +69,9 @@ Every language switch from \texttt{greek} calls the \verb|\noextrasgreek| command which in turn calls \verb|\latintext|. (For customization, you can add to or redefine the \verb|\noextrasgreek| command.) -% don't change the font encoding. With the Unicode font encodings EU1 (XeTeX) or EU2 (LuaTeX), Latin characters can be used in Greek text parts and -input via the «CB Latin transcription» is not possible.% +input via the «LGR Latin transcription» is not possible.% \footnote{% The \emph{xunicode} package provides with the \texttt{tipa} emulation an example how this could be achieved also for Unicode fonts. Alternatively, @@ -94,128 +84,6 @@ input via the «CB Latin transcription» is not possible.% \footnote{Compare the printout to the similar example in test-greek.pdf.} \end{quote} -\section{MakeUppercase, MakeLowercase} - -Capital Greek letters have diacritics (except the dialytika and sub-iota) to -the left (instead of above) and drop them in uppercase, e.g. -\ensuregreek{μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}}. - -Tonos and dasia mark a \emph{hiatus} (break-up of a diphthong) if placed on -the first vowel of a diphtong ((άι, άυ, έι, ἄι, ἄυ, ἔι). A dialytika must be -placed on the second vowel if they are dropped. This does not work (yet?) -with Unicode literals (\foreignlanguage{greek}{\MakeUppercase{άι, άυ, έι, -ἄι, ἄυ, ἔι}}). (See section «hiatus» below for a test with LICR macros.) - -The following subsections test MakeUppercase and MakeLowercase with all -characters defined in lgrenc.dfu: - -\subsection{Greek and Coptic} - -\newcommand{\GreekAndCoptic}{ -ʹ͵ͺ; ΄ ΅Ά·ΈΉΊΌΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫϘϚϜϠ} -\newcommand{\greekandcoptic}{ -άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϙϛϝϟϡ} - -Characters of the Greek and Coptic Unicode Block: - -\begin{quote} - \GreekAndCoptic\\ - \greekandcoptic -\end{quote} - -MakeUppercase: - -\begin{quote} - \MakeUppercase{\GreekAndCoptic}\\ - \MakeUppercase{\greekandcoptic} -\end{quote} - -Letters upcased, diacritics except dialytika dropped. OK. - -Ϡ (Sampi) $\mapsto$ \MakeUppercase{Ϡ} (Kappa) and -ϡ (sampi) $\mapsto$ \MakeUppercase{ϡ} (Rho) is a bug -in xgreek-fixes.def from the polyglossia package. -% This is fixed in xgreek.sty and reported to the polyglossia author. - -MakeLowercase: - -\begin{quote} - \MakeLowercase{\GreekAndCoptic}\\ - \MakeLowercase{\greekandcoptic} -\end{quote} - -The lowercase of Σ is σ (GREEK SMALL LETTER SIGMA).\footnote{% -With LICRs, it is \texttt{\textbackslash textautosigma}.} -The lowercase of Ϛ (GREEK LETTER STIGMA) is \MakeLowercase{Ϛ}. - -% \newpage - -\subsection{Greek extended} - -Characters of the Greek extended Unicode block: - -\selectlanguage{greek} -ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ \\ -ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ \\ -ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ \\ -ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ \\ -ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ \\ -ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ \\ -ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ \\ -ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ \\ -ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ \\ -ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ \\ -ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ \\ -ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ \\ -῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ \\ -ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ \\ -ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` \\ - ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾ -\selectlanguage{english} - -MakeUppercase: - -\selectlanguage{greek} - -\MakeUppercase{ ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ }\\ -\MakeUppercase{ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ }\\ -\MakeUppercase{ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ }\\ -\MakeUppercase{ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ }\\ -\MakeUppercase{ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ }\\ -\MakeUppercase{ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ }\\ -\MakeUppercase{ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ }\\ -\MakeUppercase{ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ }\\ -\MakeUppercase{ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ }\\ -\MakeUppercase{ ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ }\\ -\MakeUppercase{ ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ }\\ -\MakeUppercase{ ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ }\\ -\MakeUppercase{ ῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ }\\ -\MakeUppercase{ ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ }\\ -\MakeUppercase{ ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` }\\ -\MakeUppercase{ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾ } -\selectlanguage{english} - -MakeLowercase: - -\selectlanguage{greek} -\MakeLowercase{ ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ }\\ -\MakeLowercase{ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ }\\ -\MakeLowercase{ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ }\\ -\MakeLowercase{ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ }\\ -\MakeLowercase{ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ }\\ -\MakeLowercase{ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ }\\ -\MakeLowercase{ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ }\\ -\MakeLowercase{ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ }\\ -\MakeLowercase{ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ }\\ -\MakeLowercase{ ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ }\\ -\MakeLowercase{ ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ }\\ -\MakeLowercase{ ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ }\\ -\MakeLowercase{ ῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ }\\ -\MakeLowercase{ ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ }\\ -\MakeLowercase{ ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` }\\ -\MakeLowercase{ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾ } -\selectlanguage{english} - \section{LICR Macros} Babel defines macros for several autogenerated strings so that they may @@ -223,29 +91,14 @@ appear in the choosen language. \emph{babel-greek} uses LICR macros in order to let the string macros work independent of the font encoding. If \texttt{fontspec} is loaded before babel, babel-greek loads Greek LICR -for EU1 or EU2 from the file \texttt{greek-euenc.def} -provided with \emph{greek-fontenc} since version~0.10. - -\subsection{Hiatus} +for EU1 or EU2 from the file \texttt{greek-euenc.def} provided with +\href{http://www.ctan.org/pkg/greek-fontenc}{greek-fontenc} since +version~0.10. -The «hiatus» feature works with macro input: +With this setup, it is also possible to use accent macros instead of +pre-composed Unicode characters for letters with diacritics: +«Τ\'ι φ\'ηις;», «\`<ορα». -\selectlanguage{greek} -% from teubner: άυλος/ΑΫΛΟΣ -\acctonos\textalpha\textupsilon λος $\mapsto$ -\MakeUppercase{\acctonos\textalpha\textupsilon λος}, -\>'\textalpha\textupsilon λος $\mapsto$ -\MakeUppercase{\>'\textalpha\textupsilon λος}, -% from http://diacritics.typo.cz/index.php?id=69 μάινα -> ΜΑΪΝΑ -m\acctonos\textalpha\textiota να $\mapsto$ -\MakeUppercase{m\acctonos\textalpha\textiota να}, -% from http://de.wikipedia.org/wiki/Neugriechische_Orthographie#Das_Trema -% κέικ, ἀυπνία/αϋπνία -\textkappa\acctonos\textepsilon\textiota\textkappa $\mapsto$ -\MakeUppercase{\textkappa\acctonos\textepsilon\textiota\textkappa}, -\>\textalpha\textupsilon πνία $\mapsto$ -\MakeUppercase{\>\textalpha\textupsilon πνία}. -\selectlanguage{english} \subsection{Captions} @@ -388,7 +241,7 @@ This may be problematic with fonts that only partially support Greek and miss the numeral signs (dexiakeraia and aristerikeraia). You may redefine the commands \verb+\textdexiakeraia+ and \verb+\textaristerikeraia+ to some substitute characters. -Or, if you prefer the "normal" enumeration, write in the preamble after +Or, if you prefer the ``normal'' enumeration, write in the preamble after loading babel: \begin{verbatim} diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf Binary files differindex 10371f15172..7c24fe007d5 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex index b9924fd60e4..5a2df86cf50 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/test-unicode-lgr.tex @@ -64,8 +64,8 @@ switching the Babel language using the declarations \verb|\greekscript| or The Babel core defines the declaration \verb|\latintext| and the command \verb|\textlatin| to switch to the T1 or OT1 font encoding or typeset the -argument using this encoding. greek-fontenc adds a test for EU1 and EU2, if -the TeX engine is XeTeX or LuaTeX. Here, the «latinencoding» is +argument using this encoding. \texttt{greek.ldf} adds a test for EU1 and +EU2, if the TeX engine is XeTeX or LuaTeX. Here, \verb|\latinencoding| was \latinencoding. With XeTeX or LuaTeX, the macros \verb|\greektext| and \verb|\textgreek| @@ -98,10 +98,9 @@ Babel defines macros for several autogenerated strings so that they may appear in the choosen language. \emph{babel-greek} uses LICR macros in order to let the string macros work independent of the font encoding. -Until automatically done by \emph{euenc} for EU1 and EU2 font encodings, the -recommended way to load Greek LICR definitions is via the \emph{textalpha} -or \emph{alphabeta} packages provided with \emph{greek-fontenc} since -version~0.10. +If \texttt{fontspec} is loaded before babel, babel-greek loads Greek LICR +for EU1 or EU2 from the file \texttt{greek-euenc.def} +provided with \emph{greek-fontenc} since version~0.10. \subsection{Hiatus} @@ -111,8 +110,8 @@ The «hiatus» feature works with macro input: % from teubner: άυλος/ΑΫΛΟΣ \acctonos\textalpha\textupsilon λος $\mapsto$ \MakeUppercase{\acctonos\textalpha\textupsilon λος}, -\>'\textalpha\textupsilon λος $\mapsto$ -\MakeUppercase{\>'\textalpha\textupsilon λος}, +\'>\textalpha\textupsilon λος $\mapsto$ +\MakeUppercase{\'>\textalpha\textupsilon λος}, % from http://diacritics.typo.cz/index.php?id=69 μάινα -> ΜΑΪΝΑ m\acctonos\textalpha\textiota να $\mapsto$ \MakeUppercase{m\acctonos\textalpha\textiota να}, @@ -120,8 +119,8 @@ m\acctonos\textalpha\textiota να $\mapsto$ % κέικ, ἀυπνία/αϋπνία \textkappa\acctonos\textepsilon\textiota\textkappa $\mapsto$ \MakeUppercase{\textkappa\acctonos\textepsilon\textiota\textkappa}, -\>\textalpha\textupsilon πνία $\mapsto$ -\MakeUppercase{\>\textalpha\textupsilon πνία}. +\accpsili\textalpha\textupsilon πνία $\mapsto$ +\MakeUppercase{\accpsili\textalpha\textupsilon πνία}. \selectlanguage{english} \subsection{Captions} @@ -241,20 +240,21 @@ Some examples: \Greeknumeral{2013}, +\selectlanguage{english} Enumerated lists use Greek characters/numerals in the second and fourth level: \selectlanguage{greek} \begin{enumerate} - \item item 1 + \item \textlatin{item} 1 \begin{enumerate} - \item item 1.1 + \item \textlatin{item} 1.1 \begin{enumerate} - \item item 1.1.1 + \item \textlatin{item} 1.1.1 \begin{enumerate} - \item item 1.1.1.1 - \item item 1.1.1.2 + \item \textlatin{item} 1.1.1.1 + \item \textlatin{item} 1.1.1.2 \end{enumerate} - \item item 1.1.2 + \item \textlatin{item} 1.1.2 \end{enumerate} \end{enumerate} \end{enumerate} diff --git a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf Binary files differindex 4ab9dae3344..2b65c328544 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/usage.pdf +++ b/Master/texmf-dist/doc/generic/babel-greek/usage.pdf diff --git a/Master/texmf-dist/doc/generic/babel-greek/usage.tex b/Master/texmf-dist/doc/generic/babel-greek/usage.tex index c5bd0dc87ea..50d76aae02f 100644 --- a/Master/texmf-dist/doc/generic/babel-greek/usage.tex +++ b/Master/texmf-dist/doc/generic/babel-greek/usage.tex @@ -33,7 +33,7 @@ \newcommand{\sg}{\selectlanguage{greek}} \newcommand{\sa}{\selectlanguage{american}} \begin{document} -\show\extrasgreek +% \show\extrasgreek %\show\extraspolutonikogreek \selectlanguage{american} diff --git a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx index b06489ba3cf..f4acdae4dba 100644 --- a/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx +++ b/Master/texmf-dist/source/generic/babel-greek/babel-greek.dtx @@ -26,7 +26,7 @@ % and covered by LPPL is defined by the unpacking script (babel-greek.ins) % which is part of the package. % \fi -% \CheckSum{1558} +% \CheckSum{1553} % % \iffalse % Tell the \LaTeX\ system who we are and write an entry on the @@ -37,7 +37,7 @@ %<code>\ProvidesLanguage{greek} %\fi %\ProvidesFile{babel-greek.dtx} - [2014/10/21 v1.9c Greek support for the babel system] + [2015/09/04 v1.9d Greek support for the babel system] %\iffalse %% File `babel-greek.dtx' %% Greek language Definition File @@ -115,6 +115,8 @@ % psili and dasia.} % \changes{greek-1.9c}{2014/10/21}{Fix dummy hyphenation language names % (report/patch Ulrike Fischer).} +% \changes{greek-1.9d}{2015/07/06}{uc-/lccode corrections from xgreek are now +% in greek-euenc.def (the polyglossia version has bugs).} % % \title{Babel support for the Greek language} % \author{Apostolos Syropoulos, Günter Milde} @@ -1074,19 +1076,11 @@ % % Greek letters drop diacritics (eccept dialytika and sub-iota) in % UPPERCASE. This is not cared for by the Unicode standard. -% The file \file{xgreek-fixes.def} from \pkg{polyglossia} +% The file \file{greek-euenc.def} from \pkg{greek-fontenc} % contains the required |\lccode| and |\uccode| corrections from the % \pkg{xgreek} package by Apostolos Syropoulos. % \changes{greek-1.5}{2013/06/21}{Support XeTeX/LuaTeX.} -% \begin{macrocode} -\@ifl@aded{def}{greek-euenc}{ - \InputIfFileExists{xgreek-fixes.def}{}{\PackageWarningNoLine{babel}{% - Can't find the file "xgreek-fixes.def".\MessageBreak - For correct up/down-casing of Greek text,\MessageBreak - install the "polyglossia" package}% - } -}{} -% \end{macrocode} +% \changes{greek-1.9d}{2015/07/06}{uclc fixes not included in greek-euenc.def} % % The LGR encoded fonts that are used to typeset Greek with 8-bit TeX % define ligatures for characters with diacritics. In order for this to diff --git a/Master/texmf-dist/source/generic/babel-greek/babel-greek.ins b/Master/texmf-dist/source/generic/babel-greek/babel-greek.ins index 40690f0f58a..68cf4b88ed2 100644 --- a/Master/texmf-dist/source/generic/babel-greek/babel-greek.ins +++ b/Master/texmf-dist/source/generic/babel-greek/babel-greek.ins @@ -30,7 +30,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2013/09/10} +\def\filedate{2015/07/06} \def\batchfile{babel-greek.ins} \input docstrip.tex @@ -87,7 +87,6 @@ which is part of the package. \generate{\file{greek.ldf}{\from{babel-greek.dtx}{code}} \file{athnum.sty}{\from{athnum.dtx}{package}} \file{grmath.sty}{\from{grmath.dtx}{package}} - \file{grsymb.sty}{\from{grsymb.dtx}{package}} } \ifToplevel{ diff --git a/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx b/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx deleted file mode 100644 index 189ca4afe5c..00000000000 --- a/Master/texmf-dist/source/generic/babel-greek/grsymb.dtx +++ /dev/null @@ -1,131 +0,0 @@ -% \iffalse meta-comment -% -% Copyright 1989-2008 Johannes L. Braams and any individual authors -% listed elsewhere in this file. All rights reserved. -% -% This file is part of the Babel system. -% -------------------------------------- -% -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2003/12/01 or later. -% -% This work has the LPPL maintenance status "maintained". -% -% The Current Maintainer of this work is Johannes Braams. -% -% The list of all files belonging to the Babel system is -% given in the file `manifest.bbl. See also `legal.bbl' for additional -% information. -% -% The list of derived (unpacked) files belonging to the distribution -% and covered by LPPL is defined by the unpacking scripts (with -% extension .ins) which are part of the distribution. -% \fi -%% \CheckSum{55} -% -%\iffalse -% -%% This is file `grsymb.sty' -%% (c) 1997-2005 Apostolos Syropoulos. -%% All rights reserved. -% You are allowed to modify this file as long the initial copyright notice -% appears in the modified file. -% -% Please report errors or suggestions for improvement to -% -% Apostolos Syropoulos -% 366, 28th October Str. -% GR-671 00 Xanthi, GREECE -% -% apostolo at platon.ee.duth.gr or apostolo at obelix.ee.duth.gr -% -%\fi -%\iffalse -% \begin{macrocode} -%<*driver> -\documentclass{ltxdoc} -\GetFileInfo{grsymb.drv} -\begin{document} - \DocInput{grsymb.dtx} -\end{document} -%</driver> -% \end{macrocode} -%\fi -% -% \title{Greek Symbols} -% \author{Apostolos Syropoulos\\ -% 366, 28th October Str.\\ -% GR-671 00 Xanthi, HELLAS\\ -% E-mail: \texttt{apostolo@platon.ee.duth.gr}} -% \date{1997/09/21} -% \maketitle -% -% \MakeShortVerb{|} -% \section{Introduction} -% -% There are certain symbols which were in use in ancient Greece and which -% are of use to scholars even today. These symbols are various forms of -% qoppa and stigma, and the letter digamma. These special symbols are -% provided by the \texttt{cb} fonts which are now the official fonts for -% the \texttt{greek} option of the \texttt{babel} package. Moreover, these -% fonts provide a few more symbols such as a symbol for Euro, etc. The `tao' -% symbol although is not a greek symbol, survives mainly for reasons of -% compatibility. This little package provides access commands for these -% symbols. The package can be used only in conjunction with the |greek| -% option of the |babel| package. -% -% \StopEventually -% -% \section{The Implementation} -% -% First comes the identification part. -% -% \begin{macrocode} -%<*package> -\ProvidesPackage{grsymb}[1997/09/21\space v1.0] -\typeout{Package: `grsymb' v1.0\space <1997/09/21> (A. Syropoulos)} -% \end{macrocode} -% -% Next we check to see if the |babel| package is loaded with at least -% the |greek| option. In case it isn't, we opt to produce an error message. -% \begin{macrocode} -\@ifpackagewith{babel}{greek}{}{% - \PackageError{grsymb}{% - `greek' option of the `babel'\MessageBreak - package hasn't been loaded}{% - The commands provided by this package\MessageBreak - are specially designed for greek language\MessageBreak - typesetting with the `babel' package. Load\MessageBreak - it with at least the `greek' option.}\relax - } -% \end{macrocode} -% Now, we proceed with the definitions of the various symbols. Please note -% that |\ddigamma| is intensionally spelled erroneously, in order to avoid -% conflicts with the command |\digamma| that is defined by the package -% |amssymb|. Although the tao symbol is not a greek symbol, it is included -% mainly for reasons of compatibility. -% \begin{macrocode} -\DeclareTextCommand{\Digamma}{LGR}{\char"C3\relax} -\DeclareTextCommand{\ddigamma}{LGR}{\char"93\relax} -\DeclareTextCommand{\tao}{LGR}{\char"01\relax} -\DeclareTextCommand{\Qoppa}{LGR}{\char"14\relax} -\DeclareTextCommand{\varqoppa}{LGR}{\char"13\relax} -\DeclareTextCommand{\Sampi}{LGR}{\char"1A\relax} -\DeclareTextCommand{\vardigamma}{LGR}{\char"07\relax} -\DeclareTextCommand{\Stigma}{LGR}{\char"08\relax} -\DeclareTextCommand{\VarQoppa}{LGR}{\char"15\relax} -\DeclareTextCommand{\euro}{LGR}{\char"18\relax} -\DeclareTextCommand{\permill}{LGR}{\char"19\relax} -%</package> -% \end{macrocode} -% -% \section*{Dedication} -% I would like to dedicate this piece of work to my son -% \begin{center}Demetrios-Georgios.\end{center} -% \Finale -\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf index b2766a3b9b2..ac567cd99cc 100644 --- a/Master/texmf-dist/tex/generic/babel-greek/greek.ldf +++ b/Master/texmf-dist/tex/generic/babel-greek/greek.ldf @@ -32,7 +32,7 @@ %% and covered by LPPL is defined by the unpacking script (babel-greek.ins) %% which is part of the package. \ProvidesLanguage{greek} - [2014/10/21 v1.9c Greek support for the babel system] + [2015/09/04 v1.9d Greek support for the babel system] %% File `babel-greek.dtx' %% Greek language Definition File %% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams @@ -352,13 +352,6 @@ \ifcase#1\or \textrho\or \textsigma\or \texttau\or \textupsilon\or \textphi\or \textchi\or \textpsi\or \textomega\or \textsampi\fi \gr@num@v} -\@ifl@aded{def}{greek-euenc}{ - \InputIfFileExists{xgreek-fixes.def}{}{\PackageWarningNoLine{babel}{% - Can't find the file "xgreek-fixes.def".\MessageBreak - For correct up/down-casing of Greek text,\MessageBreak - install the "polyglossia" package}% - } -}{} \@ifl@aded{def}{lgrenc}{% \begingroup \@ifundefined{active@char\string!}{}{\catcode`!=12\relax} diff --git a/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty b/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty deleted file mode 100644 index 7873c38613c..00000000000 --- a/Master/texmf-dist/tex/generic/babel-greek/grsymb.sty +++ /dev/null @@ -1,62 +0,0 @@ -%% -%% This is file `grsymb.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% grsymb.dtx (with options: `package') -%% This is a generated file. -%% -%% Copyright 1989-2008 Apostolos Syropoulos, Johannes L. Braams, Guenter Milde, -%% and the authors listed elsewhere in this file. All rights reserved. -%% -%% This file was generated from file(s) of the babel-greek package. -%% ---------------------------------------------------------------- -%% -%% It may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% The Current Maintainer of this work is Günter Milde <milde@users.sf.net>. -%% -%% Babel-greek is a contributed package providing support for the Greek -%% language and script via the Babel system (http://www.ctan.org/pkg/babel). -%% -%% The list of derived (unpacked) files belonging to this work -%% and covered by LPPL is defined by the unpacking script (babel-greek.ins) -%% which is part of the package. -%% \CheckSum{55} -%% This is file `grsymb.sty' -%% (c) 1997-2005 Apostolos Syropoulos. -%% All rights reserved. -\ProvidesPackage{grsymb}[1997/09/21\space v1.0] -\typeout{Package: `grsymb' v1.0\space <1997/09/21> (A. Syropoulos)} -\@ifpackagewith{babel}{greek}{}{% - \PackageError{grsymb}{% - `greek' option of the `babel'\MessageBreak - package hasn't been loaded}{% - The commands provided by this package\MessageBreak - are specially designed for greek language\MessageBreak - typesetting with the `babel' package. Load\MessageBreak - it with at least the `greek' option.}\relax - } -\DeclareTextCommand{\Digamma}{LGR}{\char"C3\relax} -\DeclareTextCommand{\ddigamma}{LGR}{\char"93\relax} -\DeclareTextCommand{\tao}{LGR}{\char"01\relax} -\DeclareTextCommand{\Qoppa}{LGR}{\char"14\relax} -\DeclareTextCommand{\varqoppa}{LGR}{\char"13\relax} -\DeclareTextCommand{\Sampi}{LGR}{\char"1A\relax} -\DeclareTextCommand{\vardigamma}{LGR}{\char"07\relax} -\DeclareTextCommand{\Stigma}{LGR}{\char"08\relax} -\DeclareTextCommand{\VarQoppa}{LGR}{\char"15\relax} -\DeclareTextCommand{\euro}{LGR}{\char"18\relax} -\DeclareTextCommand{\permill}{LGR}{\char"19\relax} -\endinput -%% -%% End of file `grsymb.sty'. |