Skip to content

Commit

Permalink
solved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@luengen
luengen committed Dec 11, 2023
2 parents a3513f2 + 398d8ca commit 9e7fc32
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 61 deletions.
18 changes: 6 additions & 12 deletions P5/Source/Guidelines/en/BIB-Bibliography.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1566,18 +1566,12 @@ $Id$
<div>
<head>Works Cited Elsewhere in the Text of these Guidelines</head>
<listBibl>
<biblStruct xml:id="BIB_smiley">
<monogr>
<author>
<persName>Scott E. Fahlman</persName>
</author>
<title>The Birth, Spread, and Evolution of the Smiley Emoticon</title>
<imprint>
<date when="2021-08"/>
</imprint>
</monogr>
<ptr target="http://www.cs.cmu.edu/~sef/Smiley2021.pdf"/>
</biblStruct>
<bibl xml:id="BIB_smiley">
<author>Scott E. Fahlman</author>
<title>&quot;Joke&quot; Conversation Thread in which the :-) Was Invented</title>
<ptr target="http://www.cs.cmu.edu/~sef/Orig-Smiley.htm"/>
<date type="accessed" when="2023-12-08"/>
</bibl>
<biblStruct xml:id="KNUTH">
<monogr>
<author>
Expand Down
93 changes: 45 additions & 48 deletions P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,18 +786,10 @@ See the file COPYING.txt for details.

<!-- BEGIN duplicative section %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% … -->
<!--
I am wondering if maybe this entire section should be
dropped, as it duplicates what is in the tagdoc. Note though
that here the list is of “suggested values”, whereas in the
tagdoc they are “legal values”. I do not know which is
correct, but they should match (if this section is kept).
— Syd, 2023-11-24
If you make a change here, make it in the att.cmc.xml file,
as well!
-->

<!-- What is the tagdoc? It does not seem to be part of the chapter, so I suggest to keep this section here. -Harald 2023-11-27 -->
<!-- What is the difference between suggested and legal? Can't seem to find documentation on this -Harald 2023-11-27 -->

<p> A list of suggested values for <att>generatedBy</att> follows: <list type="gloss">
<p>A list of suggested values for <att>generatedBy</att> follows: <list type="gloss">
<label>human</label>
<item>when then content of the respective element was <q>naturally</q> typed or spoken by
a human user (cf. the chat posts in Example <ref target="#ex.haarschnitt"
Expand All @@ -806,12 +798,6 @@ See the file COPYING.txt for details.
<item>when the content of the respective element was generated after a human user
activated a template for its insertion (cf. <gi>signed</gi> and <gi>time</gi> i.e. the
signature in wiki talk in the second example below.</item>
<!-- Harald to look up “Listing 2” and “Listing 6” and
“Listing 5”, below, in the paper and replace these
references with something. (Not sure what, yet.) Ask
Peter if you have any problems with this. —
2023-11-24 -->
<!-- Fixed all occurrences of "Listing" -Harald 2023-11-27 -->
<label>system</label>
<item>when the content of the respective element was generated by the system, i.e. the CMC
environment (cf. the system message in an IRC chat in the fourth example below.</item>
Expand Down Expand Up @@ -1182,39 +1168,47 @@ See the file COPYING.txt for details.
different subcategories of names as described in <ptr target="#ND"/>. In the following
chat example (adapted from <ptr target="#BIB_DCK"/>), nicknames are linked to a
<gi>person</gi> entry as shown in Section <ref target="#CMCParticipants"/> via the
<att>corresp</att> attribute. <egXML xmlns="http://www.tei-c.org/ns/Examples"
xml:lang="de" source="#BIB_DCK">
<post modality="written" generatedBy="system" rend="color:black" synch="#f2213001.t007"
type="standard" who="#f2213001.A04" xml:id="f2213001.m27.eg35">
<name corresp="#f2213001.A04" type="NICK">
<w lemma="Konstanze" pos="NE" xml:id="f2213001.m27.t1">Konstanze</w>
</name>
<w lemma="versuchen" pos="VVPP">versucht</w>
<name corresp="#f2213001.A03" type="NICK">
<w lemma="Nasenloch" pos="NN">nasenloch</w>
</name>
<w lemma="die" pos="ART">den</w>
<w lemma="Wunsch" pos="NN">wunsch</w>
<w lemma="zu" pos="PTKZU">zu</w>
<w lemma="erfüllen" pos="VVINF">erfüllen</w>
<!-- ... -->
</post>
</egXML>
<att>ref</att> attribute.
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="de" source="#BIB_DCK">
<!-- Dortmunder Chatkorpus, chat 2213001 -->
<post modality="written" generatedBy="system" rend="color:black" synch="#f2213001.t007"
type="standard" who="#f2213001.A04" xml:id="f2213001.m27.eg35">
<name ref="#f2213001.A04" type="NICK">
<w lemma="Konstanze" pos="NE" xml:id="f2213001.m27.t1">Konstanze</w>
</name>
<w lemma="versuchen" pos="VVPP">versucht</w>
<name ref="#f2213001.A03" type="NICK">
<w lemma="Nasenloch" pos="NN">nasenloch</w>
</name>
<w lemma="die" pos="ART">den</w>
<w lemma="Wunsch" pos="NN">wunsch</w>
<w lemma="zu" pos="PTKZU">zu</w>
<w lemma="erfüllen" pos="VVINF">erfüllen</w>
<!-- ... -->
</post>
</egXML>
</p>

<p>In the the following version of the same chat snippet, the text strings with the
nicknames have been replaced by category label strings for the purpose of anonymization.
The category string and the <gi>name</gi> encoding offer some information about what has
been removed. <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#BIB_DCK">
been removed.
<!-- %%%%%%%%% still working on how to anonymize as of 2023-12-08 %%%%%%%%% -->
<egXML xmlns="http://www.tei-c.org/ns/Examples" source="#BIB_DCK">
<post modality="written" generatedBy="system" rend="color:black" synch="#f2213001.t007"
type="standard" who="#f2213001.A04" xml:id="f2213001.m27.eg36">
<name corresp="#f2213001.A04" type="NICK">
<w pos="NE">[_FEMALE-PARTICIPANT-A04_]</w>
type="standard" who="#f2213001.A04" xml:id="f2213001.m27.eg36">
<name ref="#f2213001.A04" type="NICK">
<w pos="NE">
<gap reason="anonymised" unit="word" quantity="1"/>
</w>
<w pos="NE">
<gap reason="anonymised" unit="word" quantity="1"/>
</w>
</name>
<w lemma="versuchen" pos="VVPP">versucht</w>
<name corresp="#f2213001.A03" type="NICK">
<rs ref="#f2213001.A03" type="anonymised">
<w pos="NN">[_PARTICIPANT-A03_]</w>
</name>
</rs>
<w lemma="die" pos="ART">den</w>
<w lemma="Wunsch" pos="NN">wunsch</w>
<w lemma="zu" pos="PTKZU">zu</w>
Expand All @@ -1229,13 +1223,16 @@ See the file COPYING.txt for details.

<head>Multimodal CMC</head>

<p>As explained in Section <ptr target="#CMCUnits"/> the elements <gi>post</gi>, <gi>u</gi>,
<gi>kinesic</gi>, and <gi>incident</gi> are available to to encode textual transcriptions
of written posts, spoken turns, bodily activity of avatars, and onscreen activity by users
that occur in CMC data, and in Section <ptr/> we gave recommendations on how to encode
graphics or other media data within posts with modality="written". When two or more of these
features occur in a CMC interaction, we can speak of <hi rend="italic">multimodal</hi>
CMC.</p>
<p>As explained in Section <ptr target="#CMCUnits"/> the
elements <gi>post</gi>, <gi>u</gi>, <gi>kinesic</gi>, and
<gi>incident</gi> are available to to encode textual
transcriptions of written posts, spoken turns, bodily activity
of avatars, and onscreen activity by users that occur in CMC
data, and in Section <ptr/> we gave recommendations on how to
encode graphics or other media data within posts with
<att>modality</att> set to <val>written</val>. When two or more
of these features occur in a CMC interaction, we can speak of
<hi rend="italic">multimodal</hi> CMC.</p>

<p>Some basic multimodality is available in private chat such as WhatsApp, where spoken and
written posts and media posts containing images or video clips, can alternate. The following
Expand Down
5 changes: 4 additions & 1 deletion P5/Source/Specs/att.cmc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ See the file COPYING.txt for details.
</sch:rule>
</constraint>
</constraintSpec>
<valList type="closed">
<valList type="semi">
<!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
<!-- This list is duplicated in "CMCcmcatts", so if you make a
change here, make it there, too! -->
<valItem ident="human">
<desc xml:lang="en" versionDate="2021-09-07">the content was
<soCalled>naturally</soCalled> typed or spoken by a human user</desc>
Expand Down

0 comments on commit 9e7fc32

Please sign in to comment.