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

[docs/reference] more fixes in Markdown files #10875

Merged
merged 4 commits into from
Dec 24, 2020

Conversation

michelou
Copy link
Contributor

@michelou michelou commented Dec 21, 2020

Follow up of PR #10767, #10826 and #10860.

Note: To be discussed with other members of the Scala core team/Scala Center: in his comment to my PR #10860 @SethTisue expresses the wish to have a more "official" location for the PDF document scala3_reference.pdf I generate to check my changes to the Scala 3 reference documenation. Without any reaction from you (@liufengyun ), I will suggest @SethTisue to use the current link (which is stable since the creation of my GitHub account).

Fixes more issues found in Markdown files in docs/reference/, e.g,

  • removed/added spaces/lines
  • corrected misspellings (e.g "covarant" -> "covariant")
  • corrected left margin in code block
  • reduced line width in several code blocks (to avoid text overflow in the right margin)
  • added several external links (e.g. Coq)

PS. The above changes can also be viewed in the PDF document scala3_reference.pdf (841 Kb) generated with Pandoc 2.11.

@michelou michelou requested a review from liufengyun December 21, 2020 14:49
@michelou michelou changed the title [docs/reference] more fixed in Markdown files [docs/reference] more fixes in Markdown files Dec 21, 2020
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @michelou 👍

Rebase and conflict fixes are needed.

I somehow missed this comment:

Note: To be discussed with other members of the Scala core team/Scala Center: in his comment to my PR #10860 @SethTisue expresses the wish to have a more "official" location for the PDF document scala3_reference.pdf I generate to check my changes to the Scala 3 reference documenation. Without any reaction from you (@liufengyun ), I will suggest @SethTisue to use the current link (which is stable since the creation of my GitHub account).

The difficulty is how to keep the PDF up to date with the docs. The best approach seems to be update the CI to generate the PDF as part of the website update.

@@ -84,20 +78,19 @@ Instead we extract the tuple-type for element types using pattern matching over
quotes and more specifically of the refined type:

```scala
case '{ $m: Mirror.ProductOf[T] { type MirroredElemTypes = elementTypes }} => ...
case '{ $m: Mirror.ProductOf[T] { type MirroredElemTypes = elementTypes }} => ...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accidental change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not mine (visible before rebasing with upstream).

```
On the other hand, Scala 3 offers a convenient alternative to such "program" objects
with [@main methods](../changed-features/main-functions.html).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice addition 👍

Link to markdown file for consistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's @odersky addition (visible before rebasing with upstream).


## Rules
### Rules
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe remove Implementation and only keep Rules?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@@ -123,9 +123,9 @@ Proof by structural induction over terms.

To prove (1):

- the cases for variables, lambdas and applications are as in STL.
- the cases for variables, lambdas and applications are as in [STL](https://en.wikipedia.org/wiki/Simply_typed_lambda_calculus).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- the cases for variables, lambdas and applications are as in [STL](https://en.wikipedia.org/wiki/Simply_typed_lambda_calculus).
- the cases for variables, lambdas and applications are as in [STLC](https://en.wikipedia.org/wiki/Simply_typed_lambda_calculus).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@michelou
Copy link
Contributor Author

michelou commented Dec 23, 2020

LGTM, thanks @michelou 👍

Rebase and conflict fixes are needed.

I somehow missed this comment:

Note: To be discussed with other members of the Scala core team/Scala Center: in his comment to my PR #10860 @SethTisue expresses the wish to have a more "official" location for the PDF document scala3_reference.pdf I generate to check my changes to the Scala 3 reference documenation. Without any reaction from you (@liufengyun ), I will suggest @SethTisue to use the current link (which is stable since the creation of my GitHub account).

The difficulty is how to keep the PDF up to date with the docs. The best approach seems to be update the CI to generate the PDF as part of the website update.

@liufengyun For me the relevant point is to know what is your position about generating/hosting a PDF version of the Scala 3 documentation, i.e. the reference documentation in this case. The technical aspects mostly reduce to my choice to use Pandoc for generating the PDF document. As a reminder I'm running Pandoc on Windows 10 with 4 additional files:

  • scala3_reference.yaml (Pandoc config)
  • scala3_reference.md (document structure, including title page)
  • scala3_reference.latex (latex template, derived from Pandoc default latex template)
  • md2pdf.bat (resp. md2pdf.sh) to run Pandoc with the approprate settings.

Note: I could easily write the corresponding shell script (assuming Pandoc 2.11 is available on the CI machine).

@liufengyun
Copy link
Contributor

@michelou I think it's valuable to have a PDF version and make it available on the dotty website.

@liufengyun liufengyun merged commit 626d24a into scala:master Dec 24, 2020
@michelou
Copy link
Contributor Author

@michelou I think it's valuable to have a PDF version and make it available on the dotty website.

@liufengyun I suggest we discuss the details per email.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants