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

Adjust line breaks to fix overrunning the margin / overfull hboxes #548

Merged
merged 11 commits into from
Mar 1, 2018

Conversation

jamesray1
Copy link
Contributor

@jamesray1 jamesray1 commented Feb 5, 2018

You can view overfull hbox in the output (rather than in the log) in draft mode (as an option to documentclass). I have fixed all overfull hbox warnings, i.e. there are none in the log nor visible in the output in draft mode.

Since there are many changes, I may fix more overfull hbox warnings in a separate PR (although it is easier to do it in one PR, or wait until this is merged before making more related fixes).
@jamesray1 jamesray1 mentioned this pull request Feb 5, 2018
5 tasks
\Xi_{\mathtt{SNARKV}}(\boldsymbol{\sigma}_1, g, I, \mathbf{t}) & \text{if} \quad r = 8 \\
\Xi(\boldsymbol{\sigma}_1, g, I, \mathbf{t}) & \text{otherwise} \end{cases}
\end{equation}

Copy link
Member

Choose a reason for hiding this comment

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

Why did these lines move to another paragraph?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved them because it was tricky to fit them all on one side of a cases/piecemeal equation, without getting an overfull hbox error, or just looking awkward.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But I see what you mean, I've moved them again.

Copy link
Member

Choose a reason for hiding this comment

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

Let's not move stuff around for layout reasons until the document is stable enough.

Copy link
Member

Choose a reason for hiding this comment

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

It still seems like eight or nine lines moved their positions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That was intentional, at the moment, some of these lines spill over the margins, which is why I rearranged it to fix that.

@pirapira
Copy link
Member

pirapira commented Feb 9, 2018

The conflict is too big for me to fix on the spot.

...using Libre Open Office with match case and regular expressions ticked as options.
jamesray1 added a commit to jamesray1/yellowpaper that referenced this pull request Feb 16, 2018
jamesray1 added a commit to jamesray1/yellowpaper that referenced this pull request Feb 16, 2018
@jamesray1 jamesray1 mentioned this pull request Feb 16, 2018
@jamesray1
Copy link
Contributor Author

@pirapira this should be OK to merge.

Paper.tex Outdated
@@ -407,8 +410,8 @@ \subsubsection{Holistic Validity}
\begin{array}[t]{lclc}
\linkdest{new_state_H__r}{}H_{\mathrm{r}} &\equiv& \mathtt{\small TRIE}(L_S(\Pi(\boldsymbol{\sigma}, B))) & \wedge \\
\linkdest{Ommer_block_hash_H__o}{}H_{\mathrm{o}} &\equiv& \mathtt{\small KEC}(\mathtt{\small RLP}(L_H^*(B_{\mathbf{U}}))) & \wedge \\
\linkdest{tx_block_hash_H__t}{}H_{\mathrm{t}} &\equiv& \mathtt{\small TRIE}(\{\forall i < \lVert B_{\mathbf{T}} \rVert, i \in \mathbb{P}: p(i, L_{T}(B_{\mathbf{T}}[i]))\}) & \wedge \\
\linkdest{Receipts_Root_H__e}{}H_{\mathrm{e}} &\equiv& \mathtt{\small TRIE}(\{\forall i < \lVert B_{\mathbf{R}} \rVert, i \in \mathbb{P}: p(i, \hyperlink{transaction_receipt_preparation_function_for_RLP_serialisation}{L_{R}}(B_{\mathbf{R}}[i]))\}) & \wedge \\
\linkdest{tx_block_hash_H__t}{}H_{\mathrm{t}} &\equiv& \mathtt{\small TRIE}(\{\forall i < \lVert B_{\mathbf{T}} \rVert, i \in \mathbb{P}: &\\&& \quad\quadp (i, L_{T}(B_{\mathbf{T}}[i]))\}) & \wedge \\
Copy link
Member

Choose a reason for hiding this comment

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

\quadp?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

@jamesray1
Copy link
Contributor Author

Can we get this merged so that I don't have to keep fixing merge conflicts?

@pirapira pirapira merged commit 4d2432e into ethereum:master Mar 1, 2018
jamesray1 added a commit to jamesray1/yellowpaper that referenced this pull request Nov 26, 2018
jamesray1 added a commit to jamesray1/yellowpaper that referenced this pull request Nov 26, 2018
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.

2 participants