commited on behalf of @axgeertinger

# Conflicts:
#	_guidelines-v4/03-metadata/01-header.md
#	_guidelines-v4/03-metadata/01-header/03-headerworkdescription/12-headerworkclass.md

_guidelines-v4/03-metadata/01-header.md

@@ -11,8 +11,9 @@ This chapter addresses the description of an encoded item so that the musical te
 Every MEI-conformant text not embedded in another XML carrier that provides for capturing metadata, such as TEI or METS, must carry a set of descriptions, prefixed to it and encoded as described in this chapter. This set is known as the MEI header, tagged {% include link elem="meiHead" %}, and has six major parts:
 
 1. zero or more alternative identifiers, tagged with {% include link elem="altId" %}, each of which provides an identifying name or number associated with the file.
-2. a file description, tagged {% include link elem="fileDesc" %}, containing a full bibliographic description of the computer file itself, from which a user of the text could derive a proper bibliographic citation, or which a librarian or archivist could use in creating a catalog entry recording its presence within a library or archive. The term computer file here is to be understood as referring to the whole intellectual entity or document described by the header, even when this is stored in multiple physical operating system files. The file description also includes information about the source or sources from which the electronic document was derived. The MEI elements used to encode the file description are described in section {% include link id="headerFileDescription" %} below.
+2. a file description, tagged {% include link elem="fileDesc" %}, containing a full bibliographic description of the computer file itself, from which a user of the text could derive a proper bibliographic citation, or which a librarian or archivist could use in creating a catalog entry recording its presence within a library or archive. The term computer file here is to be understood as referring to the whole intellectual entity or document described by the header, even when this is stored in multiple physical operating system files. The file description also includes information about the source or sources from which the electronic document was derived (not to be confused with sources that represent or witness the encoded work in a more general sense; these may be described within the {% include link elem="manifestationList" %} element). The MEI elements used to encode the file description are described in section {% include link id="headerFileDescription" %} below.
 3. an optional encoding description, tagged {% include link elem="encodingDesc" %}, which describes the relationship between an electronic text and its source or sources. It allows for detailed description of whether (or how) the text was normalized during transcription, how the encoder resolved ambiguities in the source, what levels of encoding or analysis were applied, and similar matters. The MEI elements used to encode the encoding description are described in section {% include link id="headerEncodingDescription" %} below.
-4. an optional work description, tagged {% include link elem="workList" %}, containing classification and contextual information about the work, such as its subject matter, the situation in which it was produced, the individuals described by or participating in producing it, and so forth. Such a work profile is of particular use in highly structured composite texts such as corpora or language collections, where it is often highly desirable to enforce a controlled descriptive vocabulary or to perform retrievals from a body of text in terms of text type or origin. The work description may however be of use in any form of automatic text processing. The MEI elements used to encode the work description are described in section {% include link id="headerWorkDescription" %} below.
-5. zero or more elements, tagged {% include link elem="extMeta" %}, containing non-MEI metadata.
-6. a revision history, tagged {% include link elem="revisionDesc" %}, which allows the encoder to provide a history of changes made during the development of the electronic text. The revision history is important for version control and for resolving questions about the history of a file. The MEI elements used to encode the revision description are described in section {% include link id="headerRevisionDescription" %} below.
+4. an optional work description or list of the works encoded or described in the file, tagged {% include link elem="workList" %}, containing classification and contextual information about the work(s), such as its subject matter, the situation in which it was produced, the individuals described by or participating in producing it, and so forth. Such a work profile is of particular use in highly structured composite texts such as corpora or language collections, where it is often highly desirable to enforce a controlled descriptive vocabulary or to perform retrievals from a body of text in terms of text type or origin. The work description may however be of use in any form of automatic text processing. The MEI elements used to encode the work description are described in section {% include link id="headerWorkDescription" %} below.
+5. an optional list of manifestations of the work, tagged {% include link elem="manifestationList" %}, containing descriptions of sources ("manifestations" in {% include link id="FRBR" %} terms) that represent or witness the encoded work in some way, regardless of whether the encoding is based on these sources or not; for instance, it is useful for listing all known sources to a particular work in a cataloging project or a critical edition.  
+6. zero or more elements tagged {% include link elem="extMeta" %}, containing non-MEI metadata.
+7. a revision history, tagged {% include link elem="revisionDesc" %}, which allows the encoder to provide a history of changes made during the development of the electronic text. The revision history is important for version control and for resolving questions about the history of a file. The MEI elements used to encode the revision description are described in section {% include link id="headerRevisionDescription" %} below.

_guidelines-v4/03-metadata/01-header/01-headerfiledescription/01-headertitlestatement.md

@@ -14,6 +14,7 @@ The title statement contains the title given to the electronic work, together wi
 {% include desc elem="arranger" %}
 {% include desc elem="author" %}
 {% include desc elem="composer" %}
+{% include desc elem="contributor" %}
 {% include desc elem="editor" %}
 {% include desc elem="funder" %}
 {% include desc elem="librettist" %}

_guidelines-v4/03-metadata/01-header/01-headerfiledescription/07-headersourcedescription.md

@@ -9,47 +9,10 @@ The {% include link elem="sourceDesc" %} element is the seventh and final compon
 {% include desc elem="sourceDesc" %}
 {% include desc elem="source" %}
 
-The content model of the {% include link elem="source" %} element is similar to that of the {% include link elem="fileDesc" %} and {% include link elem="work" %} elements. The list below reflects the order in which the optional components of {% include link elem="source" %} must occur.
+The {% include link elem="source" %} element may contain
 
-{% include desc elem="identifier" %}
-{% include desc elem="titleStmt" %}
-{% include desc elem="editionStmt" %}
-{% include desc elem="pubStmt" %}
-{% include desc elem="physDesc" %}
-{% include desc elem="physLoc" %}
-{% include desc elem="seriesStmt" %}
-{% include desc elem="history" %}
-{% include desc elem="langUsage" %}
-{% include desc elem="contents" %}
-{% include desc elem="biblList" %}
-{% include desc elem="notesStmt" %}
-{% include desc elem="classification" %}
-
-When the MEI.frbr module is available, the following elements may also appear after the classification element. Additional information regarding FRBR (Functional Requirements for Bibliographic Records) can be found at {% include link id="FRBR" %}.
-
-{% include desc elem="itemList" %}
-{% include desc elem="componentList" %}
-{% include desc elem="relationList" %}
-
-In the simplest case, the {% include link elem="source" %} element may contain nothing more than a notes statement giving a simple prose description or a brief note stating that the document has no physical source:
-
-{% include mei example="header/header-sample043.xml" valid="" %}
-{% include mei example="header/header-sample044.xml" valid="" %}
-
-Alternatively, it may contain a basic bibliographic citation, also in an annotation:
-
-{% include mei example="header/header-sample045.xml" valid="" %}
-
-However, more structured bibliographic data, such as that in the example below, facilitates better machine-processing:
-
-{% include mei example="header/header-sample046.xml" valid="" %}
-
-A description of more precise capture of dates and date ranges is provided in chapter {% include link id="namesDates" %}.
-
-The {% include link elem="identifier" %} element is provided within {% include link elem="source" %} in order to accommodate identifying strings which cannot be captured by the **@xml:id** attribute, such as numbers or strings requiring XML markup.
-
-The {% include link elem="titleStmt" %}, {% include link elem="editionStmt" %}, {% include link elem="pubStmt" %}, {% include link elem="seriesStmt" %}, and {% include link elem="notesStmt" %} elements function in exactly the same way as described in section {% include link id="headerFileDescription" %} above and {% include link id="headerWorkDescription" %} below and will not be covered again here.
-
-If a source of the file is an unpublished manuscript, it is recommended that the {% include link elem="unpub" %} element be used as the only content of the source's {% include link elem="pubStmt" %} element. Other identifying information for the manuscript may be collected in the {% include link elem="notesStmt" %} element, as described in section {% include link id="headerNotesStatement" %}.
-
-{% include mei example="header/header-sample047.xml" valid="" %}
+{% include desc elem="head" %}
+{% include desc elem="locusGrp" %}
+{% include desc elem="locus" %}
+{% include desc elem="bibl" %}
+{% include desc elem="biblStruct" %}

_guidelines-v4/03-metadata/01-header/02-headerencodingdescription.md

@@ -14,5 +14,8 @@ The encoding description may contain elements taken from the model.encodingPart
 {% include desc elem="editorialDecl" %}
 {% include desc elem="projectDesc" %}
 {% include desc elem="samplingDecl" %}
+{% include desc elem="domainsDecl" %}
+{% include desc elem="tagsDecl" %}
+{% include desc elem="classDecls" %}
 
 Each of these elements is further described in the appropriate section below.

_guidelines-v4/03-metadata/01-header/02-headerencodingdescription/05-headerclassdeclaration.md

@@ -0,0 +1,24 @@
+---
+sectionid: headerClassDeclarations
+title: "Class Declarations"
+version: "v4"
+---
+
+The {% include link elem="classDecls" %} element allows the declaration of generic taxonomies for the classification of entities according to one or both of the following two methods:
+
+- by reference to a recognized international classification scheme such as the Dewey Decimal Classification, the Universal Decimal Classification, the Colon Classification, the Library of Congress Classification, or any other system widely used in library and documentation work
+- by providing a set of keywords, as provided, for example, by British Library or Library of Congress Cataloguing in Publication data, or as defined by the encoder.
+
+
+{% include desc elem="classDecls" %}
+
+Each taxonomy may have a heading and may declare any number of categories using the {% include link elem="category" %} element. Categories may be declared by reference to existing vocabularies or simply explained by a descriptive text. 
+
+{% include mei example="header/header-sample070.xml" valid="" %}
+
+The {% include link elem="category" %} element may or may not include a bibliographic citation and/or a URI at which the classification scheme or information about it may be found.
+
+{% include mei example="header/header-sample071.xml" valid="" %}
+
+The categories declared in the taxonomies may then be referenced to within {% include link elem="classification" %} by means of the **@class** attribute as described in the {% include link elem="headerWorkClass" %} section. 
+

_guidelines-v4/03-metadata/01-header/03-headerworkdescription.md

@@ -14,23 +14,23 @@ Within {% include link elem="workList" %}, the {% include link elem="work" %} el
 
 All the components of {% include link elem="work" %} are optional, but they must occur in the following order:
 
-1. identifier
-2. titleStmt
-3. incip
-4. key
-5. mensuration
-6. meter
-7. tempo
-8. otherChar
-9. history
-10. langUsage
-11. perfMedium
-12. audience
-13. contents
-14. context
-15. biblList
-16. notesStmt
-17. classification
+1. {% include link elem="identifier" %}
+2. {% include link elem="titleStmt" %}
+3. {% include link elem="incip" %}
+4. {% include link elem="key" %}
+5. {% include link elem="mensuration" %}
+6. {% include link elem="meter" %}
+7. {% include link elem="tempo" %}
+8. {% include link elem="otherChar" %}
+9. {% include link elem="history" %}
+10.{% include link elem="langUsage" %} 
+11.{% include link elem="perfMedium" %} 
+12.{% include link elem="audience" %} 
+13.{% include link elem="contents" %} 
+14.{% include link elem="context" %} 
+15.{% include link elem="biblList" %} 
+16.{% include link elem="notesStmt" %} 
+17.{% include link elem="classification" %} 
 
 These work description components may be classed into two groups based on their function: 
 

_guidelines-v4/03-metadata/01-header/03-headerworkdescription/12-headerworkclass.md

@@ -4,29 +4,20 @@ title: "Classification"
 version: "v4"
 ---
 
-The next component of the core {% include link elem="workList" %} element is the {% include link elem="classification" %} element. This element is used to classify a musical text according to one or more of the following methods:
-
-- by reference to a recognized international classification scheme such as the Dewey Decimal Classification, the Universal Decimal Classification, the Colon Classification, the Library of Congress Classification, or any other system widely used in library and documentation work
-- by providing a set of keywords, as provided, for example, by British Library or Library of Congress Cataloguing in Publication data.
-
+Within {% include link elem="work" %}, the {% include link elem="classification" %} element is used to classify the work according to some classification scheme. More generally, {% include link elem="classification" %} may be used to classifiy any FRBR entity ({% include link elem="work" %}, {% include link elem="expression" %}, {% include link elem="manifestation" %}, or {% include link elem="item" %}).
 The following elements are provided for this purpose:
 
 {% include desc elem="termList" %}
 {% include desc elem="term" %}
-{% include desc elem="classDecls" %}
-
-The {% include link elem="termList" %} element categorizes an individual text by supplying a set of terms which may describe its topic or subject matter, its physical or intellectual form, date, etc. Each term is indicated by a {% include link elem="term" %} element. In some schemes, the order of items in the list is significant, for example, from major topic to minor; in others, the list has an organized substructure of its own. No recommendations are made here as to which method is to be preferred. Wherever possible, such terms should be taken from a recognized source.
 
-The {% include link elem="classDecls" %} element offers the possibility of capturing a bibliographic citation and/or a URI at which the classification scheme or information about it may be found.
+The {% include link elem="termList" %} element categorizes the parent entity by supplying a set of terms which may describe its topic or subject matter, its physical or intellectual form, date, etc. Each term is indicated by a {% include link elem="term" %} element. In some schemes, the order of items in the list is significant, for example, from major topic to minor; in others, the list has an organized substructure of its own. No recommendations are made here as to which method is to be preferred. Wherever possible, such terms should be taken from a recognized source. In its simplest form, the {% include link elem="term" %} element just contains a descriptive keyword.
 
-{% include mei example="header/header-sample070.xml" valid="" %}
-{% include mei example="header/header-sample071.xml" valid="" %}
 {% include mei example="header/header-sample072.xml" valid="" %}
 
-The **@term** attribute may be used on each term element to make reference, by means of an identifier, to the classification scheme from which it is drawn.
+The **@class** attribute may be used on each term element to make reference to a classification scheme (declared in the {% include link elem="classDecls" %} element) from which it is drawn.
 
 {% include mei example="header/header-sample073.xml" valid="" %}
 
-Alternatively, **@term** may be used on {% include link elem="termList" %} when all the contained terms come from the same source.
+Alternatively, **@class** may be used on {% include link elem="termList" %} when all the contained terms come from the same source.
 
 {% include mei example="header/header-sample074.xml" valid="" %}

_guidelines-v4/03-metadata/01-header/04-headermanifestationlist.md

@@ -0,0 +1,29 @@
+---
+sectionid: headerManifestationList
+title: "Manifestations"
+version: "v4"
+---
+
+
+3.1.4. Manifestations
+The {% include link elem="manifestationList" %} is available to create lists of physical sources representing a work, for instance for use in a thematic catalog or a critical edition. The {% include link elem="manifestation" %} child element corresponds to the {% include link id="FRBR" %} level of the same name, that is, it describes embodiments of certain expressions of a work. The list below reflects the order in which the optional components of manifestation must occur.
+{% include desc elem="locus" %}
+{% include desc elem="locus" %}
+{% include desc elem="locusGrp" %}
+{% include desc elem="identifier" %}
+{% include desc elem="titleStmt" %}
+{% include desc elem="editionStmt" %}
+{% include desc elem="pubStmt" %}
+{% include desc elem="physDesc" %}
+{% include desc elem="physLoc" %}
+{% include desc elem="seriesStmt" %}
+{% include desc elem="creation" %}
+{% include desc elem="history" %}
+{% include desc elem="langUsage" %}
+{% include desc elem="contents" %}
+{% include desc elem="biblList" %}
+{% include desc elem="notesStmt" %}
+{% include desc elem="classification" %}
+{% include desc elem="itemList" %}
+{% include desc elem="componentList" %}
+{% include desc elem="relationList" %}

_guidelines-v4/03-metadata/02-frbr/01-frbrentities.md

@@ -4,14 +4,14 @@ title: "FRBR Entities in MEI"
 version: "v4"
 ---
 
-When the FRBR module is available, MEI offers four elements corresponding to the FRBR entities:
+With the FRBR module, MEI offers four elements corresponding to the FRBR "Group 1" entities:
 
 {% include desc elem="work" %}
 {% include desc elem="expression" %}
-{% include desc elem="source" %}
+{% include desc elem="manifestation" %}
 {% include desc elem="item" %}
 
-The names of the MEI entities generally follow those of FRBR: the {% include link elem="work" %} element is a container for description at the FRBR "work" level, {% include link elem="expression" %} is for description at the FRBR "expression" level, and {% include link elem="item" %} holds FRBR "item" level description. The {% include link elem="source" %} element, however, is the MEI equivalent to FRBR "manifestation" level description. The name "source" is used because it is both shorter and more familiar than "manifestation" to users of existing bibliographic markup schemes.
+The names of the MEI entities follow those of FRBR: the {% include link elem="work" %} element is a container for description at the FRBR "work" level, {% include link elem="expression" %} is for description at the FRBR "expression" level, {% include link elem="manifestation" %} contains "manifestation" level description, and {% include link elem="item" %} holds FRBR "item" level description. Please note: Until MEI 3.0.0, the {% include link elem="source" %} element in {% include link elem="sourceDesc" %} was used for manifestation-level descriptions.
 
 The {% include link elem="work" %} element has an optional child element to hold the expression elements: