-
-
Notifications
You must be signed in to change notification settings - Fork 60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make publisher a name variable. #368
base: v1.1
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left some feedback, but was hard to tell the diff since you moved names to a separate file.
Any chance you have a diff you can post of just the changes there?
Perhaps look at the individual commits? I initially moved the names to a new file without any changes. |
That works; I missed that.
|
Actually, no it doesn't. The first commit is that; there's no commit with a diff of the main schema file. Or if it's straightforward, I suppose you could just tell us what changed on that schema. |
On the main schema file, I just removed the cs:names content and the names-related style options. |
Co-authored-by: Bruce D'Arcus <[email protected]>
In addition, this PR adds a new option for |
Update.
|
Maybe I've missed it, but I've only seen delimiters between names and between places. But how do you actually specify the colon between the place and the publisher? Simply an affix on the name element? |
@denismaier Yes, like with a label. |
I've tested with the 1.1 branch: <names variable="author">
<label suffix=". "/>
</names> Jing complains about the suffix on But that is: <names variable="author">
<name suffix=". "/>
<label/>
</names> So the idea is to do this? <names variable="publisher">
<place/>
<name prefix=": "/>
</names> |
If I remember correctly, 1.0.1 had affixes on |
That's a bug. |
@denismaier That's fixed now. |
But it is still only on label, not on place, right? Is that on purpose? |
Nope! Fixed. |
I added most of the text formatting attributes. Any that place shouldn't have? Only one I'm not really sure about is strip-periods?
|
Not sure. |
No, we've never had something like that before where we edit the contents of a string. I suggest we not do that now. |
@bdarcus RTM? |
Versus separate names.abbreviation, names.alternate, or names.place elements
@bdarcus @denismaier I reworked the names structure to use a single |
@bwiernik Can you please give a brief summary of your changes? And perhaps a couple of examples. It's been a while since we've discussed this. |
The current state: If a style wants to show an institution abbreviation, an alternative name (e.g., a pseudonym or screenname), or a place, they would add a This is a change from the previous version, where each of these three had separate child elements on So, for example, to render publisher and publisher place:
So, to render an institutional name in long form with the abbreviation the first time, then just the abbreviation subsequently:
To render a name with its alternative form:
A single |
In general and at first glance, looks good ... except for that
component/@component duplication.
Is that correct, or a typo?
|
Not following. The name of the element is |
A component of a component, same node name for element and attribute, makes
no sense.
Maybe we need a different name for that attribute?
I'll take a closer look later to see if I have a concrete suggestion.
|
Edit: Oh, |
Ok, this change does not affect the general behaviour here, or does it? It's only that there's now one element instead of multiple, correct? Anyway, it's hard for me to get a grasp of this using the web interface. Is it possible to checkout the PR or a certain commit? I could do some tests then in with Atom or Oxygen. @bdarcus ? |
Exactly. See here for how to check out a PR http://stackoverflow.com/questions/27567846/ddg#30584951 |
Where do we stand with this one? The issue does flag an unaddressed requested change, which I assume @bwiernik did address. If yes, can you please click that you did so, so that goes away? And on a related note, once PRs are ready, nothing has changed; right? Since this has no conflicts, I can just do the merge? I will plan to follow @denismaier's thought to actually test it soon. |
@bdarcus Is this good to merge now? |
Can you just respond to my last note, then I can test it tomorrow. IIRC, the only issues was the name/name node name issue. |
I resolved the component element/attribute issue yes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a few minor requests. In the meantime, I'll spend some time testing the rnc schema changes.
When you resolve, can please indicate that you've done so by clicking whatever github button. I forget how to actually do so, but I think it's straightforward.
EDIT: I just tried to load the csl.rnc file in nxml-mode, and got the following error:
nxml-display-file-parse-error: Reference to undefined pattern names-inheritable-options
Is it because you don't include the csl-names.rnc
file?
If I do that, the rnc-validate-format.sh
script reports ...
.../csl-names.rnc:309:7: error: syntax error
... though I'm confused by that.
@@ -243,7 +243,18 @@ | |||
"alternate": { | |||
"title": "Alternative name, such as screen name for online item or real name of pseudonymous author.", | |||
"description": "E.g. rendered as 'Smith, J. [@JSmith]'", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please include "examples" in the json schema, as elsewhere, @bwiernik?
@@ -472,6 +483,14 @@ | |||
"$ref": "#/definitions/name-variable" | |||
} | |||
}, | |||
"publisher": { | |||
"title": "Publisher of the item", | |||
"description": "e.g., [{'institution': 'Publisher', 'place': 'London, UK'}], [{'institution': 'Publisher A', 'place': 'New York, NY, US'}, {'institution': 'Publisher B', 'place': 'Berlin, Germany'}]", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here; the "e.g." stuff should go in "examples"; see the title properties, or "custom".
@@ -634,7 +653,7 @@ | |||
"type": "string" | |||
}, | |||
"original-publisher-place": { | |||
"description": "[Deprecated - Use `original` related `publisher-place` property instead]", | |||
"description": "[Deprecated - Use `original` related `publisher` property `place` property instead]", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"description": "[Deprecated - Use `original` related `publisher` property `place` property instead]", | |
"description": "[Deprecated - Use `original` related `publisher` property `place` instead]", |
Right?
|
||
## If name="alternate", use to apply separate formatting to individual name parts or to personal vs. institutional names | ||
name.name-part, | ||
name.name-type |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
name.name-type | |
name.name-type } |
I think this is the change you need for the one error, but then I get others.
Unless I'm doing something wrong with git, maybe double check the syntax problems and let me know when I can try again?
EDIT: obviously the CI isn't working correctly, as it should have flagged these issues.
Status of this PR? Also, now that you're working on 1.1, any objections @cormacrelf? |
Description
Make
publisher
a name variable and addplace
attribute to the name variable schema. This will permit correct rendering of multiple publisher/publisher places.Also:
cs:name
@form
"none" to omitname
andet-al
elements from anames
citation (e.g., to permit only the publisher-place to be rendered)@form
attribute tocs:et-al
.form="none"
suppresses the et-al term. The options here are consistent with the same attribute used incs:citation-label-format
Existing styles can be programmatically updated to achieve the current output behavior by replacing:
with
and
with
Fixes #13
Type of change
Please delete options that are not relevant.