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

DTD Formatting implemented #274

Merged
merged 1 commit into from
Jan 9, 2019
Merged

Conversation

NikolasKomonen
Copy link
Contributor

@NikolasKomonen NikolasKomonen commented Jan 3, 2019

Fixes #221, #250, #268, #226

@NikolasKomonen NikolasKomonen force-pushed the formattingDTD branch 3 times, most recently from 94a6571 to d6b09b3 Compare January 3, 2019 19:47
@fbricon
Copy link
Contributor

fbricon commented Jan 7, 2019

With this PR, the DTD from #268 (comment) is broken after formatting.

it changes
<!ELEMENT dl (dt|dd)+>
into
<!ELEMENT dl (dt|dd) +>

The plus sign should stick to the closing parenthesis

@NikolasKomonen
Copy link
Contributor Author

@fbricon Thanks, this was the one I forgot to finish.

@NikolasKomonen NikolasKomonen force-pushed the formattingDTD branch 3 times, most recently from 93a3dbe to a326846 Compare January 8, 2019 16:09
@fbricon
Copy link
Contributor

fbricon commented Jan 8, 2019

<!ATTLIST img
  src     CDATA  #REQUIRED
  alt     CDATA  #IMPLIED
  height  CDATA  #IMPLIED
  width   CDATA  #IMPLIED
  align   CDATA  #IMPLIED
  border  CDATA  #IMPLIED
  hspace  CDATA  #IMPLIED
  vspace  CDATA  #IMPLIED
  %all;>


<!-- Hypertext anchors.
	CONSTRAINT: A elements are not allowed inside
	other A elements, a fact that XML cannot express. -->

is turned into

<!ATTLIST img
   src CDATA #REQUIRED
   alt CDATA #IMPLIED
   height CDATA #IMPLIED
   width CDATA #IMPLIED
   align CDATA #IMPLIED
   border CDATA #IMPLIED
   hspace CDATA #IMPLIED
   vspace CDATA #IMPLIED
   %all;

<!-- Hypertext anchors.
	CONSTRAINT: A elements are not allowed inside
	other A elements, a fact that XML cannot express. -->

the closing bracket disappears. Also, there's an extra space added in front of each attribute.

screen shot 2019-01-08 at 11 16 40 am

@NikolasKomonen
Copy link
Contributor Author

@fbricon Updated

@NikolasKomonen NikolasKomonen force-pushed the formattingDTD branch 2 times, most recently from d0fcb67 to 88c5d0e Compare January 9, 2019 15:27
Fixes eclipse#221 and eclipse#268

Signed-off-by: Nikolas Komonen <[email protected]>
@NikolasKomonen
Copy link
Contributor Author

@fbricon tested again with dtds, all looks good.

@fbricon fbricon merged commit 393ca72 into eclipse:master Jan 9, 2019
@NikolasKomonen NikolasKomonen deleted the formattingDTD branch March 7, 2019 15:20
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