From de3d42129c1a14f8c62545feba1d90968e6ab2db Mon Sep 17 00:00:00 2001 From: HelenaSabel Date: Thu, 30 May 2019 22:50:05 +0200 Subject: [PATCH] user interface update --- HTML/about.php | 10 +- HTML/corpus.php | 9 +- HTML/criteria.xhtml | 68 +- HTML/css/project.css | 27 + HTML/css/visualizations.css | 1051 ++++++++++++++++++++++++++ HTML/db.php | 8 +- HTML/edition.php | 2 +- HTML/editionTab.php | 2 +- HTML/index.xhtml | 7 +- HTML/results.php | 2 +- HTML/ssi/footer.html | 32 +- HTML/ssi/ling-variants.svg | 58 +- HTML/ssi/radar-plot.svg | 411 +++++----- HTML/visualizations.php | 2 +- XQuery/corpus.xquery | 16 +- XQuery/count.xquery | 2 +- XQuery/count2.xquery | 4 +- XQuery/edition.xquery | 8 +- XQuery/form.xquery | 22 +- XQuery/graphs/ling-evol.xquery | 4 +- XQuery/graphs/radar-plot-form.xquery | 54 ++ XQuery/graphs/radar-plot.xquery | 25 +- XQuery/ling.xquery | 20 +- XQuery/tabular.xquery | 6 +- 24 files changed, 1523 insertions(+), 327 deletions(-) create mode 100644 HTML/css/visualizations.css create mode 100644 XQuery/graphs/radar-plot-form.xquery diff --git a/HTML/about.php b/HTML/about.php index 9e0abe0..0022c3e 100644 --- a/HTML/about.php +++ b/HTML/about.php @@ -15,8 +15,10 @@
+

ApresentaçãoAboutPresentación

+ >Presentación +

O que posso encontrar neste site?What you will find in this site Que podo encontrar neste portal? @@ -123,13 +125,13 @@ interface, in which several troubadours can be selected at the same time and,

Neste momento, o corpus estudado está conformado porAt this point, the corpus is composed of cantigas, compostas porsongs written by trovadores.trobadores. troubadours.

TextosTexts

diff --git a/HTML/corpus.php b/HTML/corpus.php index 28fb4be..03b5dec 100644 --- a/HTML/corpus.php +++ b/HTML/corpus.php @@ -15,15 +15,22 @@ + +
+ +

Corpus

+ + +

Por autor

By author

diff --git a/HTML/criteria.xhtml b/HTML/criteria.xhtml index 1d91797..804f174 100644 --- a/HTML/criteria.xhtml +++ b/HTML/criteria.xhtml @@ -306,14 +306,14 @@ pertinentes, os signos de pontuação serão comentados sistematicamente nas anotações que se realizem em cada cantiga, enquanto respondem a práticas escriturais concretas que podem revestir grande interesse para a identificação - do scriptorium implicado.

+ do scriptorium implicado.

Transcrevem-se todos os signos de pontuação no interior de verso e aqueles que indicam a abreviação de palavras por truncamento (siglas). Pegando nas funções propostas por Montoya Martínez (2000), a presente edição mantém aqueles signos de pontuação que estão a delimitar os hemistíquios, assim como aqueles que determinam a separação de vários membros duma cláusula, muito mais - habituais quando vão precedidos de uma conjunção.

+ habituais quando vão precedidos de uma conjunção.

Omitíronse os puntos que identifican o final de verso e as marcas gráficas utilizadas para identificar o refrán así como os signos que avisan da localización en que este refrán debe ser repetido.<gap> (lacuna) incluindo um atributo através do qual se informa das razões que justificam a omissão (@reason). Veja-se a Tabela 3 em que se - apresentam alguns exemplos.

+ apresentam alguns exemplos.

Esta marcação permite diferenciar entre as omissões que denotam um problema na transmissão e as lacunas condicionadas pelo estado de conservação do suporte. A maior parte das omissões do primeiro grupo devem-se a erros de cópia, @@ -761,7 +761,17 @@ realmente no testemunho e que parte é produto da intervenção do editor, especialmente porque as correspondências podem ser ambíguas em determinados contextos –contudo na tradição objeto de estudo estes casos são os menos - frequentes.

+ frequentes.Como se pode observar na Tabela 6, por cada instancia dunha abreviatura introdúcese o elemento + <choice> para codificar conxuntamente a palabra abreviada + (<abbr>) e a expansión desta dentro do elemento + <expan>, o que inclúe, pola súa parte, os caracteres + engadidos como resultado do desenvolvemento da abreviaturaAs shown in Table 6, there is a + <choice> element for each abbreviation to encode, at the + same time, both the abbreviated word (<abbr>) and its + expansion inside the element <expan>, which includes the + added characters (<ex>)

Devido às características desta edição, considera-se que é necessário oferecer um inventário com uma categorização destas convenções gráficas, exemplificando de modo conveniente e indicando o manuscrito em que são @@ -1344,23 +1354,25 @@ possíveis que permitem chegar ao nível de concreção desejado. Tendo em conta a diversidade dos nossos interesses, as variantes de língua incluem mais traços definitórios que as outras tipologias. A modo de exemplo, a distribuição mi - / min é categorizada através dos seguintes traços:
- variante de língua > fenómeno fonético-fonológico > consonantismo > - nasalização > nasalização progressiva
Cada unha - destas categorías xenéricas inclúe múltiples subcategorías posíbeis que permitem - chegar ao nivel de concreción desexado. Tendo en conta os obexectivos deste - proxecto, as variantes de língua inclúen máis trazos definitorios que as outras - tipoloxías. A modo de exemplo, a distribución mi / min é categorizada a - través dos seguintes trazos:
- variante de lingua > fenómeno fonético-fonolóxico > consonantismo > - nasalización > nasalização progresiva
Each one of - this generic categories includes multiple subcategories that enable to describe - a phenomenon with the desired level of precision. Considering the goals of this - project, linguistic variants include more defining features than the other - types. As an example, the distribution mi / min is categorised with the - following features:
- linguistic variant > phonetic-phonologic phenomenos > consonantic - system > nasalization > progressive nasalization

+ / min é categorizada através dos seguintes traços:
+ variante de língua > fenómeno fonético-fonológico > + consonantismo > nasalização > nasalização + progressiva
Cada unha destas categorías + xenéricas inclúe múltiples subcategorías posíbeis que permitem chegar ao nivel + de concreción desexado. Tendo en conta os obexectivos deste proxecto, as + variantes de língua inclúen máis trazos definitorios que as outras tipoloxías. A + modo de exemplo, a distribución mi / min é categorizada a través dos + seguintes trazos:
+ variante de lingua > fenómeno fonético-fonolóxico > + consonantismo > nasalización > nasalização + progresiva
Each one of this generic + categories includes multiple subcategories that enable to describe a phenomenon + with the desired level of precision. Considering the goals of this project, + linguistic variants include more defining features than the other types. As an + example, the distribution mi / min is categorised with the following features:
+ linguistic variant > phonetic-phonologic phenomenos > + consonantic system > nasalization > progressive + nasalization

No que respeita aos erros de cópia, contamos com uma categoria genérica e as subcategorias com que se completa a informação procuram a identificação daqueles fenómenos que estiverem relacionados com o modelo do @@ -1390,12 +1402,12 @@ variantes gráficas estão em negrito, as linguísticas de cor anil, os erros em vermelho, as lições divergentes sublinhadas e as variantes devidas a acidentes materiais de cor laranja (ver a legenda inicial da edição na Figura 3).Utilízanse as + href="#cap-criterios">Figura 3)Utilízanse as múltiples capas de información que conforman a taxonomía para materializar tipograficamente a categorización de variantes: as variantes gráficas están en negriña, as lingüísticas de cor anil, os erros en vermello, as leccións diverxentes subliñadas e as variantes debidas a accidentes materiais de cor - laranxa.The different layers of information that make up + laranxaThe different layers of information that make up the variant taxonomy are used to tipographically realise the different categories: graphic variants are bold, linguistic variants are indigo, scribal errors are red, divergent readings are underlined and variants caused by @@ -1612,11 +1624,11 @@

Para aceder à edição das cantigas, habilitou-se uma pesquisa por - autor em que se podem selecionar vários trovadores simultaneamente e, dentro - desta escolha, procurar automaticamente todas as suas cantigas ou selecionar - textos específicos (ver Figura 9). A segunda - possibilidade de pesquisa apresenta o corpus ordenado por testemunho e - copista.

+ autor em que se podem selecionar vários trovadores simultaneamente e, dentro + desta escolha, procurar automaticamente todas as suas cantigas ou selecionar + textos específicos (ver Figura 9). A segunda + possibilidade de pesquisa apresenta o corpus ordenado por testemunho e + copista.

Fig. 9: Interface para a seleção de cantigas segundo a autoriapara a selección de cantigas segundo a diff --git a/HTML/css/project.css b/HTML/css/project.css index beb27ae..081bcd8 100644 --- a/HTML/css/project.css +++ b/HTML/css/project.css @@ -1,3 +1,29 @@ +.alert { + padding: 20px; + background-color: #f44336; + color: white; +} + +.closebtn { + margin-left: 15px; + color: white; + font-weight: bold; + float: right; + font-size: 22px; + line-height: 20px; + cursor: pointer; + transition: 0.3s; +} + +.closebtn:hover { + color: black; +} + + + + + + header{ margin: 0; padding: 0; @@ -775,6 +801,7 @@ td > ul{ padding-right: .5em; white-space: nowrap; margin: 0; + text-align:center; } table, diff --git a/HTML/css/visualizations.css b/HTML/css/visualizations.css new file mode 100644 index 0000000..65c332f --- /dev/null +++ b/HTML/css/visualizations.css @@ -0,0 +1,1051 @@ +.alert { + padding: 20px; + background-color: #f44336; + color: white; +} + +.closebtn { + margin-left: 15px; + color: white; + font-weight: bold; + float: right; + font-size: 22px; + line-height: 20px; + cursor: pointer; + transition: 0.3s; +} + +.closebtn:hover { + color: black; +} + + + + +body{ + color: #32281b; + background-color: #eae5c5; + font-family: 'born'; + margin: 0%; +} + + +@font-face{ + font-family: 'TeX Gyre Schola'; + src: url('../fonts/texgyreschola-regular.otf'); +} + +@font-face{ + font-family: 'EB Garamond Initials'; + src: url('../fonts/EBGaramond-Initials.eot'); /* IE9 Compat Modes */ + src: url('../fonts/EBGaramond-Initials.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ +url('../fonts/EBGaramond-Initials.woff') format('woff'), /* Modern Browsers */ +url('../fonts/EBGaramond-Initials.ttf') format('truetype'), /* Safari, Android, iOS */ +url('../fonts/EBGaramond-Initials.svg#e41167c8191f80c007a31720e97e8dff') format('svg'); /* Legacy iOS */ + font-style: normal; + font-weight: 400; +} +menu{ + margin-top: 0; + margin-bottom: 0; + background-color: #2b3966; + display: flex; + justify-content: space-between; + padding-left: 0; + font-family: 'TeX Gyre Schola'; +} + +menu ul{ + margin-top: 0; + margin-bottom: 0; + white-space: nowrap; +} + +menu > ul > li{ + float: none; + position: relative; + list-style: none; + display: inline-block; + padding-right: 1.5%; + font-size: 1.5em; +} + +menu ul ul{ + background-color: #282633; + display: none; + position: absolute; + left: 0; + white-space: nowrap; + top: 100%; + +} + +menu a{ + display: block; + color: #FFC938; + padding: 0 15px 5px; + text-decoration: none; +} + + +ul.dropdown{ + padding-left: 0; +} +ul.dropdown li{ + display: block; + cursor: pointer; + width: 100%; + white-space: nowrap; + font-size: 0.8em; +} + +ul.dropdown a{ + font-weight: normal; +} + +h1{ + color: #555137; + margin-left: 1.65%; + text-align: center; + +} + +h2{ + color: #490301; + margin-left: 1.65%; +} + +h3{ + margin-left: 1.65%; +} + + +.languages{ + color: #FFC938; + margin-right: 2%; + font-weight: bold; + cursor: pointer; +} + +.languages span{ + font-variant: small-caps; + font-size: 1.5em; +} + +.languages a{ + display: inline; +} + +a{ + color: #CF4205; + text-decoration: none; +} + +@font-face{ + font-family: 'born'; + src: url('../fonts/Born.otf'); +} + +p{ + line-height: 150%; + text-align: justify; + margin-left: 1.65%; + margin-right: 1%; +} + +ul{ + text-align: justify; + margin-right: 1%; +} + +.bibl p{ + margin-left: 1.65%; + margin-right: 6%; + padding-left: 5%; + text-indent: -3%; +} + + +.bibl ul{ + font-size: 120% +} + +.bibl h2{ + text-align: center +} + +.arrow{ + font-size: x-large; + text-align: center; + display: block} + +.en{ + display: none; +} + +.pt{ + display: none; +} + +.gl{ + display: none; +} + + +.mxgraph{ + position: relative; + overflow: auto; + width: 100%; + margin-left: 1.65% + +} + +.mxgraph > div{ + width: 1px; + height: 1px; + overflow: hidden; +} + + +.radar{ + display: flex; + justify-content: space-between; +} + +.radar div { + margin-right: 2%; + font-size:smaller; +} + +.radarF{ + list-style: none; + width: -moz-max-content; + width: -webkit-max-content; + width: -o-max-content; +} + + +.radarF li{ + white-space: nowrap; +} + +g[id ^= "esc"]{ + display: none; +} + +/* Footer */ + +footer{ + display: flex; + flex-direction: column; + font-size: smaller; + line-height: 100%; +} + + +.license p{ + padding-top: 0.5%; + display: flex; + align-items: center; +} + +.license img{ + margin-left: 15px; + width: 60px; +} + +.acknowledments{ +} + + +.acknowledments div{ + display: flex; + align-items: center; + justify-content: space-around; +} + +.normal{ + width: 100px; +} + +.big{ + width: 150px +} + +.stats{ + margin-left: 1.65%; +} + +.stats h3 +{ + margin-left: 0%; +} + +/* Edition */ + +.multiple{ + display: flex; +} + +.body{ + margin-top: 2%; + margin-bottom: 2%; +} +.center{ + text-align: center; +} + +.witness{ + padding-left: 1%; + padding-right: 2%; + margin-bottom: 2%; + margin-left: 2%; + flex-grow: 1; + counter-reset: numbers; +} + +.witness h3{ + margin-left: 0%; +} + +section{ + width: 82%; + border-right: 1px solid #2b3966; +} + +section svg{ + margin-left: 2%; +} + +svg a:hover{ + opacity: 0.5; +} + +section h3{ + display: flex; + margin-left: 7.5%; + margin-bottom: 2%; + +} + +section h4{ + display: flex; + margin-left: 7.5%; + margin-top: 1%; + margin-bottom: 2%; +} + +.witness h4{ + margin-left: 0%; +} + +.metadata h2{ + color: #F2F2AF; + font-size: 115%; +} + +aside{ + min-width: 16.9%; + width: 18%; + max-height: 100vh; + overflow-y: auto; + margin: 0; + padding: 0 +} + + +aside h3{ + padding-top: 1%; + padding-left: 5%; +} + +aside ul{ + list-style-type: square; +} + + + +.metadata{ + padding: 1%; + background-color: #562302; +} + +.body{ + display: flex; +} + +.uni{ + font-family: 'junicode', 'Free Serif', 'EversonMono'; +} + +.body ol{ + font-family: 'junicode', 'Free Serif', 'EversonMono'; + list-style-type: none; + margin-left: 0; + padding-left: 0; +} + +li.refrao{ + padding-left: 7%; +} + +.body li{ + counter-increment: numbers; + position: relative; + margin-left: 4%; + color: black; +} + +.body li::before{ + content: counter(numbers) "."; + font-size: 80%; + color: #838383; + font-weight: bold; + text-align: right; + position: absolute; + left: -2.5em; + width: 2em; + padding: 0.8% 1% 0 0; + +} + + +.flex{ + display: flex; +} + +.flex svg{ + padding-right: 5px; +} + +.flex p{ + display: flex; +} + +.popup svg{ + width: 17px; + height: 17px; +} + +.expansion{ + display: none; +} + +.reg{ + display: none; +} + +.ex{ + font-style: italic; +} + + +.graphic{ + font-weight: bold; +} + +.error{ + color: #D14205; +} + +.gap{ + color: #D14205; +} + +.linguistic{ + color: #6C659D; + font-weight: bold; +} + +.equipolent{ + text-decoration: underline; +} + +del{ + color: red; + text-decoration: none; +} + +del.scrape{ + opacity: 0.9; +} + +.criteria fieldset{ + border: none; +} + +.criteria span{ + white-space: nowrap; +} + +.criteria{ + margin-bottom: 2%; + border: 1px solid #2b3966; + margin-left: 1.65%; + margin-right: 1.66%; + +} + +.criteria label{ + white-space: normal; +} + + +.dinamic span{ + border: 1px solid #2b3966; + font-size: smaller; + padding: 1% 2% 1% 2%; + color: #2b3966; + margin-left: 5%; + +} +ins{ + text-decoration: none; +} + + +ins.enhance.above::after{ + content: "/"; + color: #73843A; +} + +ins.enhance.above::before{ + content: "\\"; + color: #73843A; +} + +ins.enhance.margin::after{ + content: "//"; + color: #73843A; +} + +ins.enhance.margin::before{ + content: "\\\\"; + color: #73843A; +} + +ins.enhance.scrape::before{ + content: "⸢"; + color: #73843A; +} + +ins.enhance.scrape::after{ + content: "⸣"; + color: #73843A; +} + +[data-exp = Letra\ de\ espera]::before{ + content: "⟨"; + color: #515050; +} + +[data-exp = Letra\ de\ espera]::after{ + content: "⟩"; + color: #515050; +} + +[data-exp = Guide\ letter]::before{ + content: "⟨"; + color: #515050; +} + +[data-exp = Guide\ letter]::after{ + content: "⟩"; + color: #515050; +} + +[data-exp]:hover{ + cursor: pointer; + +} + +.corpus{ + display: inline-flex; +} + +.corpus span{ + padding-right: 0.4em; +} + +#highlight{ + background-color: #FFF8DC; + width: -moz-max-content; + width: -webkit-max-content; + width: -o-max-content; +} + +@font-face{ + font-family: 'palemonas'; + src: url('../fonts/palemonas/palemmufi-reg-webfont.woff2') format('woff2'), +url('../fonts/palemonas/palemmufi-reg-webfont.woff') format('woff'), +url('../fonts/palemonas/palemmufi-reg-webfont.ttf') format('truetype'), +url('../fonts/palemonas/palemmufi-reg-webfont.svg#palemonas_mufiregular') format('palemonas/svg'); + font-weight: normal; + font-style: normal; + +} + +@font-face{ + font-family: 'junicode'; + src: url('../fonts/junicode/junicode-italic-webfont.eot'); + src: url('../fonts/junicode/junicode-italic-webfont.eot?#iefix') format('embedded-opentype'), +url('../fonts/junicode/junicode-italic-webfont.woff2') format('woff2'), +url('../fonts/junicode/junicode-italic-webfont.woff') format('woff'), +url('../fonts/junicode/junicode-italic-webfont.ttf') format('truetype'), +url('../fonts/junicode/junicode-italic-webfont.svg#junicodeitalic') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face{ + font-family: 'junicode'; + src: url('../fonts/junicode/junicode-webfont.eot'); + src: url('../fonts/junicode/junicode-webfont.eot?#iefix') format('embedded-opentype'), +url('../fonts/junicode/junicode-webfont.woff2') format('woff2'), +url('../fonts/junicode/junicode-webfont.woff') format('woff'), +url('../fonts/junicode/junicode-webfont.ttf') format('truetype'), +url('../fonts/junicode/junicode-webfont.svg#junicoderegular') format('svg'); + font-weight: normal; + font-style: normal; + +} + + + + +/*@font-face { + font-family: 'junicode'; + src: url('../fonts/junicode/junicode-bold-webfont.eot'); + src: url('../fonts/junicode/junicode-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/junicode/junicode-bold-webfont.woff2') format('woff2'), + url('../fonts/junicode/junicode-bold-webfont.woff') format('woff'), + url('../fonts/junicode/junicode-bold-webfont.ttf') format('truetype'), + url('../fonts/junicode/junicode-bold-webfont.svg#junicodebold') format('svg'); + font-style: normal; + font-weight: bold; + +}*/ + + + + +/*@font-face { + font-family: 'junicode'; + src: url('../fonts/junicode/junicode-bolditalic-webfont.eot'); + src: url('../fonts/junicode/junicode-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/junicode/junicode-bolditalic-webfont.woff2') format('woff2'), + url('../fonts/junicode/junicode-bolditalic-webfont.woff') format('woff'), + url('../fonts/junicode/junicode-bolditalic-webfont.ttf') format('truetype'), + url('../fonts/junicode/junicode-bolditalic-webfont.svg#junicodebold_italic') format('svg'); + font-style: italic; + font-weight: bold; + +}*/ + +/*Web form songs */ + +.hide{ + display: none; +} + +fieldset{ + border: 1px solid #2b3966; + margin: 1%; +} + +fieldset > div{ + display: flex; +} + +fieldset > span{ + margin-right: 1%; + padding-left: .5%; +} + +fieldset ul{ + list-style: none; + padding: 0; +} + +fieldset li{ + padding-bottom: 8%; + white-space: nowrap; + +} + +legend{ + padding: 0.2em 0.5em; + border: 1px solid #2b3966; + color: #2b3966; + font-size: 90%; + font-weight: 500; + white-space: nowrap; +} + +button{ + color: white; + background-color: #2b3966; + padding: 0.7em; + margin-left: 1%; +} +.authors{ + display: flex; + flex-direction: column; +} + +.authors button{ + width: 15%; + align-self: center; +} + +input{ + margin: 0; + align-self: flex-start; +} + +form{ + margin-left: 1.65%; + margin-right: 1.65%; + width: 97%; + margin-bottom: 6%; +} + +div.form{ + display: flex; +} + +.item{ + flex-grow: 1; + width: 48%; +} + + +.form label{ + padding-right: 2%; +} + +/*Phenomena forms*/ + + +table{ + background-color: #EAE5C5; + width: 98%; + text-align: center; + margin-top: 2%; + margin-bottom: 2%; + margin-left: 1%; +} + +.tabular table{ + width: auto; + font-family: 'junicode'; + border: none; + margin-left: 4%; + margin-top: 0%; +} + +.tabular{ + padding-top: 2%; +} + +.tabular p{ + font-size: small; + font-weight: bold; + text-align: right; + color: #838383; + left: 3em; + width: 2em; + position: absolute; + margin-top: -0.5%; +} + + +.tabular td{ + border: none; + white-space: nowrap; + text-align: left; + padding-left: 7px; + padding-right: 7px; + padding-bottom: 0; + padding-top: 0; +} + +.tabular table tbody td:nth-child(1){ + color: #562302; + font-weight: 700; + font-size: small; + vertical-align: central; + padding-right: 9px; + border-right: 1px solid #838383; +} + +td > ul{ + list-style: none; + padding-left: .5em; + padding-right: .5em; + white-space: nowrap; + margin: 0; + text-align:center; +} + +table, +th, +td{ + border: 2px solid #490301; + border-collapse: collapse; + padding: 3px; + +} + +td.intro{ + background-color: #D0CCB0; + font-family: 'junicode'; +} + + +table.sortable th{ + color: #D0CCB0; + white-space: nowrap; + background-color: #490301; +} + +/*tbody td:nth-child(1){ + font-style: italic; +} + +tbody td:nth-child(1) span.normal, +tbody td:nth-child(1) +.ex{ + font-style: normal; +}*/ + +table.sortable th:not(.sorttable_sorted):not(.sorttable_sorted_reverse):not(.sorttable_nosort):after{ + content: url(../images/arrow.svg) +} + +table.sortable th > svg{ + display: inline; +} + +th{ + color: #D0CCB0; + white-space: nowrap; + background-color: #490301; +} + +.second th{ + background-color: #D0CCB0; + color: #CF4205; +} + +ul ul{ + list-style: circle; +} + +.phenom h3{ + margin-left: 2%; +} + +.phenom h2{ + margin-left: 2%; + padding-top: 3%; +} + +#tab-alografos img{ + width: 1.2em; +} + +#tab-alografos .med img{ + width: 1.7em; +} + +#tab-alografos .big img{ + width: 2em; +} + +#tab-abrv-lin img{ + width: 5em; +} + +#tab-abrv-lin .small img{ + width: 3em; +} + +#tab-gap img{ + width: 4em; +} + +#tab-gap .big img{ + width: 10em; +} + +#tab-del img{ + width: 6em; +} + +#tab-del .small img{ + width: 2.5em; +} +#tab-del .big img{ + width: 12em; +} + +img.fx{ + width: 1.15em; +} + +.5 img{ + width:5em; +} + +figure{ + margin-left: auto; + margin-right: auto; + width: 50%; + text-align: center; + text-indent: 0; + border: thin silver solid; + padding: 0.5em; +} + +div.figure{ + width: 100%; + display: flex; +} + +figure.med{ + width: 35%; +} + +figure.small{ + width: 30%; +} + +figure.small img{ + width: 70% +} + +img.small{ + width: 60%; +} + +figure img{ + width: 100%; +} + +figure figure{ + width: 50%; + border: 0; + +} + +caption{ + font-weight: 600; +} + +figcaption{ + font-weight: 600; +} + +code{ + font-weight: 600; + color: #490301; + font-size: 1.15em; +} + +.note{ + position: relative; + width: 40%; + left: 30%; + background-color: #bd6d03; + color: #490301; + padding: 0.5%; + font-style: italic; + text-align: center; +} + + +/* Small devices compatibility */ + +@media all and (max-width : 940px){ + menu{ + font-size: smaller; + } +} + +@media all and (max-width : 805px){ + .languages{ + display: inline; + } + + .languages span{ + margin: 0; + padding: 0; + } + + .languages a{ + padding: 0; + } + menu > ul{ + padding-left: 0; + } + + menu a{ + padding-right: 5px; + padding-left: 5px; + } +} + + +@media all and (min-width : 613px){ + menu > ul li:hover{ + background: #393649; + } + menu li:hover ul{ + display: block; + } + menu li li:hover{ + background-color: #393649; + } + +} + +@media all and (max-width : 612px){ + + menu > ul{ + height: auto; + } + menu > ul > li{ + float: none; + display: block; + width: 100%; + } + menu > ul a{ + line-height: 40px; + } + + menu a{ + padding-bottom: 0%; + } + + menu > ul ul{ + position: relative; + } + menu li.tap ul{ + display: block; + background-color: inherit; + padding-left: 4%; + } + + body{ + margin: 0; + font-size: smaller; + } + .languages{ + display: flex; + flex-direction: column; + } + menu{ + flex-direction: row; + } +} diff --git a/HTML/db.php b/HTML/db.php index 23872b5..3c0fd64 100644 --- a/HTML/db.php +++ b/HTML/db.php @@ -15,14 +15,20 @@ +
+ +

Fenómenos de variaçãociónVariation phenomena

+ + +

Variantes de línguaLinguistic variants

diff --git a/HTML/edition.php b/HTML/edition.php index f9e6163..d45656b 100644 --- a/HTML/edition.php +++ b/HTML/edition.php @@ -95,7 +95,7 @@ class="en" $scribeValues = implode(",", $scribes); $line = $_GET["line"]; require_once('config.php'); - $query = REST_PATH . "/db/VTLGP/queries/edition.xquery?song=" . $songValues . "&author=" . $authorValues . + $query = REST_PATH . "/db/variatio/queries/edition.xquery?song=" . $songValues . "&author=" . $authorValues . "&scribe=" . $scribeValues . "&line=" . $line; echo file_get_contents($query); diff --git a/HTML/editionTab.php b/HTML/editionTab.php index eef9684..8617764 100644 --- a/HTML/editionTab.php +++ b/HTML/editionTab.php @@ -87,7 +87,7 @@ class="en" $value = $_SERVER['QUERY_STRING']; require_once('config.php'); - $query = REST_PATH . "/db/VTLGP/queries/tabular.xquery?" . $value; + $query = REST_PATH . "/db/variatio/queries/tabular.xquery?" . $value; echo file_get_contents($query); ?> diff --git a/HTML/index.xhtml b/HTML/index.xhtml index 954b817..cb477d9 100644 --- a/HTML/index.xhtml +++ b/HTML/index.xhtml @@ -8,15 +8,20 @@ + +
+ +

Galician-Portuguese secular lyric: philology and historical linguistics Lírica profana galego-portuguesa: entre filologia e história da línguafiloloxía e - historia da lingua

+ historia da lingua +

Welcome to the website that holds the dissertation project Digital Humanities and its application to the study of linguistic variation in the Galician-Portuguese lyric by Helena Bermúdez Sabel, diff --git a/HTML/results.php b/HTML/results.php index ea7fc4e..20f502d 100644 --- a/HTML/results.php +++ b/HTML/results.php @@ -24,7 +24,7 @@ $parameters = $_GET['phenomenon']; $values = implode(",", $parameters); require_once('config.php'); - $query = REST_PATH . "/db/VTLGP/queries/ling.xquery?phenomenon=" . $values; + $query = REST_PATH . "/db/variatio/queries/ling.xquery?phenomenon=" . $values; echo file_get_contents($query); ?> diff --git a/HTML/ssi/footer.html b/HTML/ssi/footer.html index ad31e6b..bcdac9b 100644 --- a/HTML/ssi/footer.html +++ b/HTML/ssi/footer.html @@ -21,24 +21,44 @@

AcknowledgementsAgradecimentos

- O trabalho Este proxecto foi elaborado como parte dunha tese de doutoramento + financiada polo Programa de Formación del Profesorado Universitario + (AP2012-4518) do Ministerio de Educación Cultura y Deporte. Ademais, este traballo + foi realizado ao amparo do proxecto Paleografía, Lingüística y Filología. + Laboratorio on-line de la lírica gallego-portuguesa (FFI2015-68451-P) + financiado polo Ministerio de Economía, Industria y Competitividad. + Este projeto foi elaborado no molde duma tese de doutoramento + financiada pelo Programa de Formación del Profesorado Universitario + (AP2012-4518) do Ministerio de Educación Cultura y Deporte. Ademais, este trabalho + foi realizado ao amparo do projeto Paleografía, Lingüística y Filología. + Laboratorio on-line de la lírica gallego-portuguesa (FFI2015-68451-P) + financiado pelo Ministerio de Economía, Industria y Competitividad. + This project was developed as part of a PhD thesis in the framework of + the Programa de Formación del Profesorado Universitario (AP2012-4518), + funded by the Ministerio de Educación Cultura y Deporte. In addition, this work was + conducted under the shelter of the project Paleografía, Lingüística y Filología. + Laboratorio on-line de la lírica gallego-portuguesa (FFI2015-68451-P) + funded by the Ministerio de Economía, Industria y Competitividad. +

+

+ O trabalho Lírica profana galego-portuguesa: entre filologia e - história da língua de de Helena Bermúdez Sabel está disponível com uma Licença Creative Commons - Atribuição-CompartilhaIgual 4.0 Internacional. - O traballo O traballo Lírica profana galego-portuguesa: entre filoloxía e - historia da lingua de de Helena Bermúdez Sabel está dispoñíbel cunha Licenza Creative Commons - Atribución-ComparteIgual 4.0 Internacional. - Galician-Portuguese lyric: philology and historical linguistics by Galician-Portuguese lyric: philology and historical linguistics by Helena Bermúdez Sabel is licensed under a Número ocorrências - Folio Ms. A + Folio Ms. A @@ -65,33 +65,33 @@ Número de fenómenos únicos - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HTML/ssi/radar-plot.svg b/HTML/ssi/radar-plot.svg index ad4e8a1..48d343d 100644 --- a/HTML/ssi/radar-plot.svg +++ b/HTML/ssi/radar-plot.svg @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + 0 10 20 @@ -27,238 +27,249 @@ 40 60 80 - - Linguistic variants - Variantes de língua - - - Error - - - - Other - Outras - - - Lições divergentes - Leccións diverxentes - Divergent readings - + Variantes de lingua + Erros de copia + Outras + Diverxentes - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HTML/visualizations.php b/HTML/visualizations.php index f1f79cb..dc79d57 100644 --- a/HTML/visualizations.php +++ b/HTML/visualizations.php @@ -25,7 +25,7 @@

diff --git a/XQuery/corpus.xquery b/XQuery/corpus.xquery index 950104a..e101841 100644 --- a/XQuery/corpus.xquery +++ b/XQuery/corpus.xquery @@ -4,11 +4,11 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization"; declare option output:method "xhtml"; declare option output:indent "yes"; declare option output:encoding "UTF-8"; -let $authors := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/VTLGP/edition')//tei:name[@role eq 'author']/@ref] +let $authors := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/variatio/edition')//tei:name[@role eq 'author']/@ref] let $periods := $authors/tei:floruit/@period -let $copyists := collection('/db/VTLGP/edition')//tei:div//tei:title//tei:rdg/substring(@hand, 2) -let $authorsImpar := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/VTLGP/edition')//tei:name[@role eq 'author']/@ref][tei:persName/matches(., '^[A-J]')] -let $authorsPar := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/VTLGP/edition')//tei:name[@role eq 'author']/@ref][tei:persName/matches(., '^[L-Z]')] +let $copyists := collection('/db/variatio/edition')//tei:div//tei:title//tei:rdg/substring(@hand, 2) +let $authorsImpar := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/variatio/edition')//tei:name[@role eq 'author']/@ref][tei:persName/matches(., '^[A-J]')] +let $authorsPar := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = collection('/db/variatio/edition')//tei:name[@role eq 'author']/@ref][tei:persName/matches(., '^[L-Z]')] return (
@@ -81,7 +81,7 @@ return for $x in 1 to (count($authorsPar)) let $author := $authorsPar[$x] let $i := $x + 14 - let $songs := collection('/db/VTLGP/edition')//tei:name[@role eq 'author'][@ref = $author/concat('#', @xml:id)]/ancestor::tei:div + let $songs := collection('/db/variatio/edition')//tei:name[@role eq 'author'][@ref = $author/concat('#', @xml:id)]/ancestor::tei:div order by $author return
@@ -156,7 +156,7 @@ return action="edition.php"> { for $period in distinct-values($periods) - let $songs := collection('/db/VTLGP/edition')//tei:name[@role eq 'author'][@ref = $authors[tei:floruit/@period eq $period]/concat('#', @xml:id)]/ancestor::tei:div + let $songs := collection('/db/variatio/edition')//tei:name[@role eq 'author'][@ref = $authors[tei:floruit/@period eq $period]/concat('#', @xml:id)]/ancestor::tei:div order by number($period) return
@@ -229,7 +229,7 @@ return action="edition.php"> { for $hand in distinct-values($copyists) - let $songs := collection('/db/VTLGP/edition')//tei:div[@type eq 'poem'][.//tei:title//tei:rdg/substring(@hand, 2) = $hand] + let $songs := collection('/db/variatio/edition')//tei:div[@type eq 'poem'][.//tei:title//tei:rdg/substring(@hand, 2) = $hand] order by $hand return
diff --git a/XQuery/count.xquery b/XQuery/count.xquery index 9e14e47..672fc61 100644 --- a/XQuery/count.xquery +++ b/XQuery/count.xquery @@ -1,5 +1,5 @@ xquery version "3.0"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; -let $songs := collection('/db/VTLGP/edition')//tei:div[@type eq 'poem'] +let $songs := collection('/db/variatio/edition')//tei:div[@type eq 'poem'] return count($songs) \ No newline at end of file diff --git a/XQuery/count2.xquery b/XQuery/count2.xquery index 5c66155..75d68f8 100644 --- a/XQuery/count2.xquery +++ b/XQuery/count2.xquery @@ -1,5 +1,5 @@ xquery version "3.0"; declare namespace tei = "http://www.tei-c.org/ns/1.0"; -declare variable $songs := collection('/db/VTLGP/edition')//tei:div[@type eq 'poem']; -declare variable $authors := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = $songs//tei:name[@role eq 'author']/@ref]; +declare variable $songs := collection('/db/variatio/edition')//tei:div[@type eq 'poem']; +declare variable $authors := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = $songs//tei:name[@role eq 'author']/@ref]; count($authors) diff --git a/XQuery/edition.xquery b/XQuery/edition.xquery index 9ceb56e..e052114 100644 --- a/XQuery/edition.xquery +++ b/XQuery/edition.xquery @@ -31,8 +31,8 @@ declare function functx:distinct-deep $nodes[$seq][not(functx:is-node-in-sequence-deep-equal( ., $nodes[position() < $seq]))] }; -declare variable $cantigas := collection('/db/VTLGP/edition')//tei:div[@type eq 'poem']; -declare variable $poets := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[@xml:id/string() = $cantigas//tei:name[@role eq 'author']/substring(@ref, 2)]; +declare variable $cantigas := collection('/db/variatio/edition')//tei:div[@type eq 'poem']; +declare variable $poets := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[@xml:id/string() = $cantigas//tei:name[@role eq 'author']/substring(@ref, 2)]; declare variable $partialselection := request:get-parameter("song", ()); declare variable $partialSelection := request:get-parameter("author", ()); declare variable $nextSelection := request:get-parameter("scribe", ()); @@ -55,7 +55,7 @@ return
{ for $song in functx:distinct-deep($songs) - let $author := doc('/db/VTLGP/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = $song//tei:name[@role eq 'author']/@ref] + let $author := doc('/db/variatio/ancillary/corpus-autores.xml')//tei:person[concat('#', @xml:id) = $song//tei:name[@role eq 'author']/@ref] order by $song/number(substring-before(substring(@corresp, 3), 'B')) return
CopistaCopyist: {$witness/substring(@hand, 2)}

- {transform:transform($song//tei:lg, doc('/db/VTLGP/xslt/reading.xsl'), $parameter)} + {transform:transform($song//tei:lg, doc('/db/variatio/xslt/reading.xsl'), $parameter)} diff --git a/XQuery/form.xquery b/XQuery/form.xquery index 1a198de..98fb3e5 100644 --- a/XQuery/form.xquery +++ b/XQuery/form.xquery @@ -4,12 +4,12 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization"; declare option output:method "xhtml"; declare option output:indent "yes"; declare option output:encoding "UTF-8"; -let $songs := collection('/db/VTLGP/edition')//tei:div[@type eq 'poem'] +let $songs := collection('/db/variatio/edition')//tei:div[@type eq 'poem'] let $anas := $songs//tei:rdg/@ana let $ana := distinct-values(for $values in $anas return tokenize($values, '\s+')) -let $file := doc('/db/VTLGP/ancillary/feature-library.xml') +let $file := doc('/db/variatio/ancillary/feature-library.xml') let $ling-features := $file//tei:fvLib/tei:fs[concat('#', @xml:id) = $ana] let $phonetic := $ling-features[.//tei:fs[@type eq 'phonetic']] let $morph := $ling-features[.//tei:fs[@type eq 'morphosyntactic']/tei:f[@name eq 'POS']/tei:fs] @@ -37,7 +37,7 @@ return id="{$id/@xml:id}" value="{$id/@xml:id}"/>, ,
) + for="{$id/@xml:id}">{transform:transform($name, 'xmldb:exist:///db/variatio/xslt/string.xsl', ())},
) }
@@ -54,7 +54,7 @@ return id="{$id/@xml:id}" value="{$id/@xml:id}"/>, ,
) + for="{$id/@xml:id}">{transform:transform($name, 'xmldb:exist:///db/variatio/xslt/string.xsl', ())},
) }
@@ -71,7 +71,7 @@ return id="{$id/@xml:id}" value="{$id/@xml:id}"/>, ,
) + for="{$id/@xml:id}">{transform:transform($name, 'xmldb:exist:///db/variatio/xslt/string.xsl', ())},
) }