diff --git a/examples/eoatex/EOASample.tex b/examples/eoatex/EOASample.tex index a6b4f35..6b9b0af 100755 --- a/examples/eoatex/EOASample.tex +++ b/examples/eoatex/EOASample.tex @@ -38,7 +38,8 @@ % The command \EOAtoc inserts the table of contents \EOAtoc - +% only works if tocdepth > 0 +\listoffigures %% Set page numberic to arabic \pagenumbering{arabic} %% Start page numbering with 1 @@ -96,9 +97,8 @@ \EOAtocentry{Location index} \EOAprintlocationindex -% \EOAfacsimilepart{Facsimiles} -% \input{texfiles/09_facsimiles} - +\EOAfacsimilepart{Facsimiles} +\input{texfiles/09_facsimiles} % This marks the end of the document. Everything below that line is % ignored diff --git a/examples/eoatex/preambel/pre_eoa.tex b/examples/eoatex/preambel/pre_eoa.tex index 1a53e81..dfb4ca5 100755 --- a/examples/eoatex/preambel/pre_eoa.tex +++ b/examples/eoatex/preambel/pre_eoa.tex @@ -1,36 +1,37 @@ -% Version: 1.6 -% 30/07/2015 -% Last modifier: Georg - -\documentclass[12pt,openright,twoside]{scrbook} +%with "draft" the PDF is compiled without images +% \documentclass[10pt,openright,twoside,draft]{scrbook} +\documentclass[10pt,openright,twoside]{scrbook} \usepackage{xargs} % Basic packages used for if-else \usepackage{xifthen} \usepackage{ifplatform} +\newboolean{isxml} +\setboolean{isxml}{false} + % new version -\usepackage[markcase=nouppercase]{scrlayer-scrpage} -\renewcommand*{\chaptermarkformat}{\thechapter .~} -\setkomafont{pagehead}{\footnotesize\upshape} -\ohead[]{\thepage} -\ihead[]{\leftmark} -\ofoot[]{} +% \usepackage[markcase=nouppercase]{scrlayer-scrpage} +% \renewcommand*{\chaptermarkformat}{\thechapter .~} +% \setkomafont{pagehead}{\footnotesize\upshape} +% \ohead[]{\thepage} +% \ihead[]{\leftmark} +% \ofoot[]{} % Redefining the header -% \usepackage{fancyhdr} -% \pagestyle{fancy} % eigenen Seitestil aktivieren} -% \fancyhfoffset{0pt} -% \fancyhead[RO,LE]{\footnotesize \nouppercase\thepage} -% \fancyhead[RE,LO]{\footnotesize \nouppercase\leftmark} -% %Use to change the size of the header font -% %\fancyhead[RO,LE]{\normalfont\changefontsizes{8pt} \nouppercase\thepage} -% %\fancyhead[RE,LO]{\normalfont\changefontsizes{8pt} \nouppercase\leftmark} -% \renewcommand\chaptermark[1]{\markboth{\thechapter. #1}{}} -% \renewcommand{\headrulewidth}{0pt} -% \fancyfoot{} -% \fancypagestyle{plain}{% -% \fancyhead{}} +\usepackage{fancyhdr} +\pagestyle{fancy} % eigenen Seitestil aktivieren} +\fancyhfoffset{0pt} +\fancyhead[RO,LE]{\footnotesize \nouppercase\thepage} +\fancyhead[RE,LO]{\footnotesize \nouppercase\leftmark} +%Use to change the size of the header font +%\fancyhead[RO,LE]{\normalfont\changefontsizes{8pt} \nouppercase\thepage} +%\fancyhead[RE,LO]{\normalfont\changefontsizes{8pt} \nouppercase\leftmark} +\renewcommand\chaptermark[1]{\markboth{\thechapter. #1}{}} +\renewcommand{\headrulewidth}{0pt} +\fancyfoot{} +\fancypagestyle{plain}{% +\fancyhead{}} % Activate fontspec for various fonts \usepackage[no-math]{fontspec} @@ -53,7 +54,7 @@ \renewcommand{\figurename}{Abb.}% } -\usepackage{csquotes} +\usepackage[autostyle]{csquotes} % Definition of fonts for Chinese based on OS \ifwindows @@ -124,7 +125,9 @@ \ifthenelse% {\equal{#1}{Sources}}% %% changing format to A4. What about the margins? - {\usepackage[a4paper,inner=30mm,outer=30mm,top=14mm,bottom=20mm,includehead]{geometry}}% + {\usepackage[a4paper,inner=30mm,outer=30mm,top=14mm,bottom=20mm,includehead]{geometry} + \KOMAoption{fontsize}{12pt} + }% % the else part { \ifthenelse% @@ -218,6 +221,38 @@ \setunit{\addcolon\space}% \usebibmacro{issue}% \newunit} + +% origdate, thanks to https://tex.stackexchange.com/questions/134644/how-to-get-automatically-origdate-with-the-date-in-a-citation +\DeclareFieldFormat{origdate}{\mkbibbrackets{##1}} +\renewbibmacro*{cite:labeldate+extradate}{% + \iffieldundef{origyear} + {} + {\printorigdate + \setunit{\addspace}}% + \iffieldundef{labelyear} + {} + {\printtext[bibhyperref]{\printlabeldateextra}}} + +\DeclareCiteCommand{\citeorigyear} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\printfield{origyear}} + {\multicitedelim} + {\usebibmacro{postnote}} + +\renewbibmacro*{date+extradate}{% + \iffieldundef{origyear} + {} + {\printorigdate + \setunit{\addspace}}% + \iffieldundef{labelyear} + {} + {\printtext[parens]{% + \iflabeldateisdate + {\printdateextra} + {\printlabeldateextra}}}} + % Bug fix for Windows \defbibheading{none}[]{} } @@ -240,7 +275,7 @@ }{}% \ifthenelse% {\equal{#1}{monograph}}% -{\usepackage[mincitenames=1,maxcitenames=3,maxbibnames=100,style=authoryear,backend=biber,autolang=hyphen,dateabbrev=false,urldate=long]{biblatex} +{\usepackage[mincitenames=1,maxcitenames=3,maxbibnames=100,style=authoryear,backend=biber,autolang=hyphen,dateabbrev=false,datecirca=true,dateuncertain=true,dateera=christian,urldate=long]{biblatex} \newboolean{anthology} \setboolean{anthology}{false} \EOAbibtweaks @@ -253,7 +288,7 @@ \EOAbibtweaks }{}% % Small font for Bibliography -% \renewcommand*{\bibfont}{\normalfont\changefontsizes{8pt}} +\renewcommand*{\bibfont}{\footnotesize} }% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -276,6 +311,10 @@ }{} } +% removing chapter info +% \renewcommand{\thefigure}{\arabic{figure}} +% \renewcommand{\thetable}{\arabic{figure}} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------- formatierung der Fussnoten Anfang --------- \usepackage[flushmargin]{footmisc} @@ -306,10 +345,9 @@ \newcommand{\EOAfnarabic}[1]{\protect\footnotearabic{#1}} %%%%%%%%%%%% Footnote Sets --end - % ------------------- formatierung der Fussnoten Ende --------- -% cpation dient zur Realisierung der Bildunterschriften +% caption dient zur Realisierung der Bildunterschriften \usepackage{caption} % footnote-package needed to typeset footnotes in captions % problem was that both footnotes and captions are fragile @@ -328,8 +366,9 @@ %Use to add alphabetical headers within the index %\usepackage{imakeidx} \usepackage{imakeidx} -\makeindex[name=keywords,title=Subject Index,options=-s preambel/dontdeleteindex.ist] -\makeindex[name=persons,title=Name Index,options=-s preambel/dontdeleteindex.ist] +% set noautomatic=true to disable generation of ind file (in case you made manual changes there) +\makeindex[name=keywords,title=Subject Index,options=-s preambel/dontdeleteindex.ist, noautomatic=false] +\makeindex[name=persons,title=Name Index,options=-s preambel/dontdeleteindex.ist, noautomatic=false] \makeindex[name=locations,title=Index of Locations,options=-s preambel/dontdeleteindex.ist] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -383,10 +422,8 @@ % Formatierung der Überschriften Ende %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Tiefe des Inhaltsverzeichnisses -\setcounter{tocdepth}{0} -%Use to repress subsections in the table of content (GP, 14.07.2015) -%\setcounter{tocdepth}{0} +% Depth of table of contents. If value = 0, listoffigures will be empty +\setcounter{tocdepth}{1} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Formatierung des Inhaltsverzeichnisses @@ -402,10 +439,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Definition einiger Makros zur Erhöhung des Bedienkomforts - Anfang -% Makro für fetten Text -\newcommand{\EOAbold}[1]{\textbf{#1}} % Makro für kursiven Text \newcommand{\EOAemph}[1]{\emph{#1}} +% Makro für fetten Text +\newcommand{\EOAbold}[1]{\textbf{#1}} % Makro für einen URL \newcommand{\EOAurl}[1]{\protect\url{#1}} % \newcommand{\EOAurl}[1]{\protect\href{#1}{#1}} @@ -724,6 +761,7 @@ \usepackage{tabularx} \usepackage{booktabs} \usepackage{longtable} + % Middle rule should be thicker, therefore redefining lightrulewidth for \midrule \setlength\lightrulewidth{1.2pt} diff --git a/examples/eoatex/preambel/pre_xml.tex b/examples/eoatex/preambel/pre_xml.tex index 1abac11..3397e16 100644 --- a/examples/eoatex/preambel/pre_xml.tex +++ b/examples/eoatex/preambel/pre_xml.tex @@ -1,4 +1,6 @@ \documentclass{book} +\newboolean{isxml} +\setboolean{isxml}{true} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Die Anweisung ist notwendig für die korrekte Nummerierung der - + @@ -273,7 +273,7 @@

If you want to include a longer quote in a text, use the block quote feature. And inside that we also introduce you to how you can insert footnotes (Piaget 1985).

- A rather short block quote.

 + A rather short block quote.

Poems

If you don't want a paragraph to be indented, use noindent

and verses can be included with the EOAverse environment:

Prudence and knowledge descend @@ -327,7 +327,7 @@
Labels -

ElementsIndexing can be assigned labels so that they can be referred to: sections

Cross reference to Chapter

, images

There is a nice image in section .

, tables

There is a table in section

. A lot of things can be cross-referenced.

+

ElementsIndexing can be assigned labels so that they can be referred to: sections

Cross reference to Chapter

, images

There is a nice image in section .

, tables

There is a table in section

. A lot of things can be cross-referenced.

By the way, JoyceJames Joyce is a very good author. Read some of his stuff. It may be useful for indexing some of your key terms in the text so that we can later link to catalogues that tells the reader more about the things. Joyce died in ZurichZürich. You cannot read anything about him in neither Walkowski's work of nor in !

@@ -345,8 +345,8 @@
Citations

The bibliographic information is kept in a separate database. The text file only contains references to the specific database entry. Examples of citations are distributed throughout this document. It also possible to customize the citations with Plat. tim..Pavendish, Lord Pharles (son of the second puke of Pevonshire)duty of service

-

Another important issue is the sorting of entries where a two publications have the same authors and the same year: and .

-

We can also cite newspapers:

+

Another important issue is the sorting of entries where a two publications have the same authors and the same year: and .

+

We can also cite newspapers:

@@ -373,7 +373,7 @@

Floating environments are bigger constructs like figures and tables, said Gamba in .

This chapter also showcases the use of two different sets of footnotes, alphabetic and arabic. This is a per-chapter-setting.

-

If you want to, you can leave the placing of them to the typesetting system, in order to avoid bigger stretches of white space (cf. ).

Here comes a footnote with arabic number as marker, which means it is is the other apparatus

+

If you want to, you can leave the placing of them to the typesetting system, in order to avoid bigger stretches of white space (cf. ).

Here comes a footnote with arabic number as marker, which means it is is the other apparatus

Tables

The following lines of code produce a table consisting of 4 columns and 3 rows.

diff --git a/schema/legacy/eoa-tei-strict.rnc b/schema/legacy/eoa-tei-strict.rnc index b5c49e9..0e55c05 100644 --- a/schema/legacy/eoa-tei-strict.rnc +++ b/schema/legacy/eoa-tei-strict.rnc @@ -42,16 +42,7 @@ tei_header = element respStmt { attribute xml:id { xsd:NCName }, element resp { text }?, - element persName { - attribute ref { xsd:anyURI }?, - element surname { text }, - element forename { text }, - element email { text }?, - element affiliation { - element roleName { text }, - element orgName { text }+ - }* - } + ( organization | person ) }+ }, element editionStmt { @@ -81,17 +72,14 @@ tei_header = }+ }, element idno { - attribute type { "isbn"|"doi"|"shoplink" }, + attribute type { "isbn"|"isbnpdf"|"isbnepub"|"doi"|"shoplink" }, text }*, element date { attribute when { xsd:date } }, element distributor { - element orgName { - attribute ref { xsd:anyURI }, - text - } + organization }?, element availability { element licence { @@ -180,6 +168,24 @@ tei_header = }? } +person = + element persName { + attribute ref { xsd:anyURI }?, + element surname { text }, + element forename { text }, + element email { text }?, + element affiliation { + element roleName { text }, + element orgName { text }+ + }* + } + +organization = + element orgName { + attribute ref { xsd:anyURI }?, + text + } + title = element title { attribute level { "m" }, @@ -209,7 +215,7 @@ author-or-volumeeditor = editors = element editor { - attribute role { "submitter"|"editorialcoordinator"|"copyeditor"|"translator"|"publicationmanager"|"publicationassistant" }, + attribute role { "submitter"|"editorialcoordinator"|"copyeditor"|"translator"|"publicationmanager"|"publicationassistant"|"imageprocessor" }, attribute ref { xsd:anyURI }, text }* @@ -264,6 +270,7 @@ chapter = attribute resp { text }?, head-ex-abbr, element epigraph { p+ }?, + authorbio?, chapterabstract?, ( eoaelement | section | sourcesfeatures)*, # TODO: make this non optional: @@ -362,7 +369,7 @@ lg = element list { attribute type { "ordered" | "unordered" | "gloss" }, (element item { spanmarkup } - | element label { xsd:NCName })+ + | element label { spanmarkup })+ } table = @@ -398,6 +405,12 @@ ab = text } +authorbio = + element ab { + attribute type {"authorbio"}, + (text | markup | foreign | ref | bibref)* + } + chapterabstract = element ab { attribute type {"chapterabstract"},