From c7f76d102c03f3dc31bc5c447fa427bb28228192 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Mon, 6 Jul 2020 16:01:07 -0400 Subject: [PATCH 1/6] Document colon, comma, semicolon terms --- specification.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/specification.rst b/specification.rst index 76acacc..f24d4cc 100644 --- a/specification.rst +++ b/specification.rst @@ -394,7 +394,7 @@ set to an `xsd:language locale code `_, determines which languages or language dialects are affected (see `Locale Fallback`_). -See `Terms`_, `Localized Date Formats`_ and `Localized Options`_ for further +See `Terms`_, `Localized Date Formats`_, `Localized Punctuation`_, and `Localized Options`_ for further details on the use of ``cs:locale``. An example of ``cs:locale`` in a style: @@ -686,6 +686,13 @@ a localized date format: +Localized Punctuation +~~~~~~~~~~~~~~~~~~~~~ + +The terms ``colon``, ``comma``, and ``semicolon`` define locale-specific punctuation marks. +When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in ``value``, ``prefix``, ``suffix``, and ``delimiter`` attributes are replaced with their corresponding terms. +Any ":", ",", or ";" characters contained in item data are unchanged. + Localized Options ~~~~~~~~~~~~~~~~~ From 54b411f7ab68d04ba0659401f29862939e835b66 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Mon, 6 Jul 2020 16:02:20 -0400 Subject: [PATCH 2/6] Add addendum to comma, etc. doc --- specification.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/specification.rst b/specification.rst index f24d4cc..5fd636e 100644 --- a/specification.rst +++ b/specification.rst @@ -692,6 +692,7 @@ Localized Punctuation The terms ``colon``, ``comma``, and ``semicolon`` define locale-specific punctuation marks. When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in ``value``, ``prefix``, ``suffix``, and ``delimiter`` attributes are replaced with their corresponding terms. Any ":", ",", or ";" characters contained in item data are unchanged. +Other characters included in affected attributes aside from ":", ",", or ";" (e.g., spaces) are unchanged. Localized Options ~~~~~~~~~~~~~~~~~ From 4d73edfecc36cb32d289c3b708f665fd2e096d09 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Tue, 7 Jul 2020 12:34:36 -0400 Subject: [PATCH 3/6] Clarify attributes affected by punctuation terms. --- specification.rst | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/specification.rst b/specification.rst index 5fd636e..be113a1 100644 --- a/specification.rst +++ b/specification.rst @@ -690,7 +690,22 @@ Localized Punctuation ~~~~~~~~~~~~~~~~~~~~~ The terms ``colon``, ``comma``, and ``semicolon`` define locale-specific punctuation marks. -When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in ``value``, ``prefix``, ``suffix``, and ``delimiter`` attributes are replaced with their corresponding terms. +When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in the follow attributes are replaced with their corresponding terms: + +- ``after-collapse-delimiter`` +- ``cite-group-delimiter`` +- ``delimiter`` +- ``initialize-with`` +- ``name-delimiter`` +- ``names-delimiter`` +- ``prefix`` +- ``range-delimiter`` +- ``sort-separator`` +- ``suffix`` +- ``title-delimiter`` +- ``year-suffix-delimiter`` +- ``value`` + Any ":", ",", or ";" characters contained in item data are unchanged. Other characters included in affected attributes aside from ":", ",", or ";" (e.g., spaces) are unchanged. From 7d5bf7f4b298ab5b1b59b3d68cc1f4e99398e312 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Tue, 7 Jul 2020 12:38:24 -0400 Subject: [PATCH 4/6] Fix typo and add title-delimiter to whitespace-preserving attributes --- specification.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification.rst b/specification.rst index be113a1..62d5aff 100644 --- a/specification.rst +++ b/specification.rst @@ -64,8 +64,9 @@ is intended for output: - range-delimiter - sort-separator - suffix +- title-delimiter - year-suffix-delimiter --value +- value File Types ---------- From 6146aa07adf5c8cffee4a485c01977270f7748e9 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Tue, 7 Jul 2020 21:00:58 -0400 Subject: [PATCH 5/6] Add title-sub-delimiter to puncutation attribute list --- specification.rst | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/specification.rst b/specification.rst index 62d5aff..c20c0b6 100644 --- a/specification.rst +++ b/specification.rst @@ -65,6 +65,7 @@ is intended for output: - sort-separator - suffix - title-delimiter +- title-sub-delimiter - year-suffix-delimiter - value @@ -693,19 +694,20 @@ Localized Punctuation The terms ``colon``, ``comma``, and ``semicolon`` define locale-specific punctuation marks. When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in the follow attributes are replaced with their corresponding terms: -- ``after-collapse-delimiter`` -- ``cite-group-delimiter`` -- ``delimiter`` -- ``initialize-with`` -- ``name-delimiter`` -- ``names-delimiter`` -- ``prefix`` -- ``range-delimiter`` -- ``sort-separator`` -- ``suffix`` -- ``title-delimiter`` -- ``year-suffix-delimiter`` -- ``value`` +- after-collapse-delimiter +- cite-group-delimiter +- delimiter +- initialize-with +- name-delimiter +- names-delimiter +- prefix +- range-delimiter +- sort-separator +- suffix +- title-delimiter +- title-sub-delimiter +- year-suffix-delimiter +- value Any ":", ",", or ";" characters contained in item data are unchanged. Other characters included in affected attributes aside from ":", ",", or ";" (e.g., spaces) are unchanged. From 6c397895f6d964e30e76b3d1d870350a7aad5dd4 Mon Sep 17 00:00:00 2001 From: "Brenton M. Wiernik" Date: Thu, 30 Jul 2020 12:55:22 -0400 Subject: [PATCH 6/6] Update punctuation spec Per @PaulStanley, make replacement unconditional. Add whitespace handling specification --- specification.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification.rst b/specification.rst index c20c0b6..9fd7733 100644 --- a/specification.rst +++ b/specification.rst @@ -692,7 +692,7 @@ Localized Punctuation ~~~~~~~~~~~~~~~~~~~~~ The terms ``colon``, ``comma``, and ``semicolon`` define locale-specific punctuation marks. -When specified in the locale, all instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in the follow attributes are replaced with their corresponding terms: +All instances of the ":" (``colon``), "," (``comma``), and ";" (``semicolon``) characters specified in the style in the follow attributes are replaced with their corresponding terms: - after-collapse-delimiter - cite-group-delimiter @@ -709,8 +709,9 @@ When specified in the locale, all instances of the ":" (``colon``), "," (``comma - year-suffix-delimiter - value +If the term contains whitespace character(s) before or after ":", ",", or ";" whitespace characters specified in the respective positions in affected attributes are removed (replaced by the whitespace in the term). Any ":", ",", or ";" characters contained in item data are unchanged. -Other characters included in affected attributes aside from ":", ",", or ";" (e.g., spaces) are unchanged. +Other characters included in affected attributes aside from ":", ",", or ";" and affected whitespace are unchanged. Localized Options ~~~~~~~~~~~~~~~~~