Skip to content
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

New documentation rendering #154

Merged
merged 29 commits into from
Aug 25, 2021
Merged

Conversation

jmaerki
Copy link
Contributor

@jmaerki jmaerki commented Mar 18, 2021

As per the last telco, I present my first merge request for documentation changes on the 1.1 branch. This work is still ongoing.

@sgrossberndt
Copy link
Contributor

Could you update to the latest state here please?

OJP/OJP_FareSupport.xsd Outdated Show resolved Hide resolved
OJP/OJP_PlaceSupport.xsd Outdated Show resolved Hide resolved
docs/check-ojp-schemas.sh Show resolved Hide resolved
jmaerki added 8 commits May 25, 2021 16:28
…intermediate XML files and from that directly an HTML file without going through asciidoc.css.

ojp-to-asciidoc.xsl is not basically obsolete and can be deleted when all issues are resolved.
Refs now resolve their type information. (VDVde#138)
Cleanup for the stylesheets.
Deprecated the old ojp-to-asciidoc.xsl.
Set exit code based on check results.
Integrate into travis CI.
(VDVde#153)
@jmaerki
Copy link
Contributor Author

jmaerki commented May 31, 2021

I think I'm finally done with pretty much all open issues.

@sgrossberndt
Copy link
Contributor

Hello @jmaerki, please rebase this pull request so we can merge it.

@jmaerki
Copy link
Contributor Author

jmaerki commented Jul 21, 2021

I'm not a daily Git user and have never worked with rebase and do not yet know exactly how that works. I currently lack the time to educate myself on it in order not to mess up. So I've done what I could and just merged the latest changes on changes_for_v1.1 to the doc_issues branch. I hope this is enough. In case it is not, I've added write access to @sgrossberndt to my repo in the hopes that this helps. Otherwise, please allow a few more days so I can make time to educate myself on "rebase".

@sgrossberndt
Copy link
Contributor

Hi @jmaerki, your last action 9a10832 was exactly the step needed. Thanks

.travis.yml Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/ojp-to-asciidoc.xsl Outdated Show resolved Hide resolved
docs/schema-collection.xml Outdated Show resolved Hide resolved
@sgrossberndt
Copy link
Contributor

Hi @jmaerki , could you please update this pull request?

@jmaerki
Copy link
Contributor Author

jmaerki commented Aug 23, 2021

Done. Sorry for the delay. Busy times.

@sgrossberndt
Copy link
Contributor

@sgrossberndt sgrossberndt merged commit adbe375 into VDVde:changes_for_v1.1 Aug 25, 2021
sgrossberndt pushed a commit that referenced this pull request Aug 25, 2021
As explained in detail in docs/README.md the rendering of the documentation tables has received a complete overhaul by @jmaerki removing the interim asciidoc step and fixing the known rendering issues.

* Mandatory elements in bold (#136)
Improve code reuse.

* Table for single element types. (#140)

* Better build-up of tables to avoid asciidoc syntax problems. (#137)

* Enumerations list their possible values. (#134)
Fixed a problem with automatic table headers.
Fixed a problem with nested structures and table building.

* Fixed filename in documentation. (#139)

* Typo: Removed trailing dot from element name. (#139)

* Full cross-references for all locally defined elements. (#139)

* Mandatory elements in bold also on first column. (#136)

* Improved anchor and links for schema's h2. (#139)

* Enabled section/chapter numbering. (#133)

* Unified depth handling.
Properly document attributes.

* Fixed bad selection for generating text.

* Additional column for choices (a-z) as in previous Word-based documentation. (#143)

* Separate stylesheet for checking XML Schema conventions or mistakes in the OJP Schemas. (#153)

* Just drop the current version

* Rewrite of the documentation generation: new stylesheets generate an intermediate XML files and from that directly an HTML file without going through asciidoc.css.
ojp-to-asciidoc.xsl is not basically obsolete and can be deleted when all issues are resolved.
Refs now resolve their type information. (#138)

* Added documentation for the generation process.
Cleanup for the stylesheets.
Deprecated the old ojp-to-asciidoc.xsl.

* Ignore generated intermediate file.

* Added link to deployed HTML file on GitHub Pages.

* Removed project-specific link again.

* Added substitutionGroup attribute handling.

* Added some color to check-ojp-schemas.sh.
Set exit code based on check results.
Integrate into travis CI.
(#153)

* Typo. (#154)

* Added missing options for resolved groups. (#165)

* Removed obsolete stylesheet. (#154)

* More cleanup according to feedback. (#154)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants