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

Diagrams at arbitrary position and DITAA diagrams #56

Merged
merged 2 commits into from
Apr 12, 2022

Conversation

MickeJohannesson
Copy link

Used base from #28 and done some modifications to it
Fixes the issure #21

  • Added support to add an PUML diagram in the page in format ! [name] (name.puml) and it will be excluded from the normal rendering of the page. All other will be in top/bottom
  • Merged from latest master and fixed the merge problems.
  • Removed the extra config settings added in this PR, instead use current one (PLANTUML_SERVER_URL)
  • Updated with latest PlantUML (plantuml-1.2022.1.jar)
  • Updated some NPMs: md-to-pdf and joi
  • Fixed "Download link" in deep folder structures (had problem on level 3 where it lost subfolders)
  • Added "new line" on Download link/Go to link (before they came next to the diagram instead of under it)
  • Added support for DITAA diagram type (only PNG is supported)

@MickeJohannesson
Copy link
Author

Added in the fix for #52

Copy link

@vellala2000 vellala2000 left a comment

Choose a reason for hiding this comment

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

This MR has some great features that I am looking forward to use. However the MR has lot of changes which make it hard to review. May be there is an opportunity to speed up this process if this is split this into smaller chunks.

@adrianvlupu adrianvlupu merged commit bb96214 into adrianvlupu:master Apr 12, 2022
@biznuge
Copy link

biznuge commented Apr 19, 2022

@MickeJohannesson - Love the new position your diagram anywhere in the .md file. One thing I noted is the command line now requires input. it there a non-interactive flag that we can use to bypass this for CI builds etc.

Again. Nice PR. :)

@vellala2000
Copy link

I had the same problem running the build in the pipeline. However its resolved after adding the new configs and removed file hashes from .c4builder. Not exactly 100% sure which one did the trick. Here are the properties i currently have

{
	"plantumlVersion": "latest",
	"projectName": "",
	"homepageName": "",
	"repoUrl": "",
	"rootFolder": "",
	"distFolder": "",
	"generateMD": false,
	"generatePDF": false,
	"generateCompleteMD": true,
	"generateCompletePDF": false,
	"generateWEB": true,
	"supportSearch": true,
	"webTheme": "//unpkg.com/docsify/lib/themes/vue.css",
	"docsifyTemplate": "",
	"webPort": "3000",
	"pdfCss": "",
	"includeBreadcrumbs": true,
	"includeLinkToDiagram": false,
	"diagramsOnTop": true,
	"embedDiagram": false,
	"generateLocalImages": true,
	"plantumlServerUrl": "https://www.plantuml.com/plantuml",
	"diagramFormat": "svg",
	"charset": "UTF-8",
	"hasRun": true,
	"excludeOtherFiles": false
}

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.

4 participants