Short modelica listings #2325
Merged
Short modelica listings #2325
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(Use as default, all long listings specify language.)
And within as keyword in grammar.
to avoid ambiguity with keyword "annotation".
sjoelund
added a commit
to sjoelund/ModelicaSpecification
that referenced
this pull request
May 9, 2019
commit 2aed3d7 Merge: 6f5748e 1352ab0 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Apr 23 12:00:53 2019 +0200 Merge pull request modelica#2347 from modelica/HansOlsson-patch-1 Update inheritance.tex commit 1352ab0 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Apr 17 17:34:40 2019 +0200 Update inheritance.tex Duplicated code. commit 6f5748e Merge: a6b2b08 f33a5e6 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Apr 3 13:47:41 2019 +0200 Merge pull request modelica#2343 from modelica/HansOlsson-patch-1 Link for MCP/0033 commit f33a5e6 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Apr 3 11:28:47 2019 +0200 Link for MCP/0033 commit a6b2b08 Merge: 61c0bdd 83af475 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Apr 3 11:26:19 2019 +0200 Merge pull request modelica#2342 from modelica/beutlich-patch-1 Mark closed MCPs commit 83af475 Author: Thomas Beutlich <thomas.beutlich@esi-group.com> Date: Wed Apr 3 10:58:58 2019 +0200 Mark closed MCPs commit 61c0bdd Merge: 2e972ee acc5ae3 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Apr 3 10:23:16 2019 +0200 Merge pull request modelica#2341 from henrikt-ma/master New LaTeX environments for non-normative text and examples commit acc5ae3 Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Tue Apr 2 15:08:52 2019 +0200 Use upright font for brackets around non-normative text commit c742e2e Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Mon Apr 1 14:43:40 2019 +0200 Clean up language definitions commit 995d917 Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Sat Mar 30 00:04:30 2019 +0100 Define environments 'nonnormative' and 'example', with application to two test cases In order for this to work with reasonable markup of inline code, one should drop the 'basicstyle' argument to \lstinline, with the consequence that the font size will be the same as for displayed listings. To me, this looks even better than when normal font size is used, but that's obviously a matter of taste. The only alternative that I have managed to think of so far would be to change all \lstinline[basicstyle=\ttfamily] to \lstinline[basicstyle=\upshape\ttfamily] but I just find that to be an unacceptable amount of boilerplate code for every inline code snippet. The environments are not intended for use inside paragraphs, but to stand as paragraphs by themselves. Hence, even if they could be used inside paragraphs as they are defined now, I would consider it an error to do so, since that would limit how we can improve the styling in the future. commit 8c7236c Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Mon Apr 1 14:47:14 2019 +0200 Remove the \nonnormative command It will be replaced by an environment instead that will be better suited for inclusion of inline code. commit 65ba224 Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Mon Apr 1 14:27:50 2019 +0200 Define 'short' dialect of 'modelica' using plain 'modelica' as base language commit 5715a51 Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Fri Mar 29 23:25:51 2019 +0100 Remove overridden call to lstset in preamble commit 084dc8b Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Fri Mar 29 22:27:41 2019 +0100 Clean up whitespace commit 2e972ee Merge: c3ac93c 98c67c6 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 26 14:04:50 2019 +0100 Merge pull request modelica#2336 from modelica/henrikt-ma-patch-1 Allocating MCP number for "Annotations for Predefined Plots" commit c3ac93c Merge: dbd05aa cada67d Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Fri Mar 22 14:45:21 2019 +0100 Merge pull request modelica#2330 from HansOlsson/Design98 Decisions from Design98 commit 98c67c6 Author: Henrik Tidefelt <henrikt@wolfram.com> Date: Fri Mar 22 07:04:13 2019 +0100 Allocating MCP number for "Annotations for Predefined Plots" There are now at least three players interested in driving this idea forward (MAP-Lib, MathCore and OSMC), so it is time to get the work to prepare an MCP started. commit cada67d Merge: 0dd5228 1217a59 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Tue Mar 19 18:18:20 2019 +0100 Merge branch 'Design98' of https://github.com/HansOlsson/ModelicaSpecification into Design98 commit 0dd5228 Merge: 646c147 dbd05aa Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Tue Mar 19 18:14:43 2019 +0100 Merge remote-tracking branch 'upstream/master' into Design98 commit dbd05aa Merge: 1a418d6 c62b47b Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 19 17:41:41 2019 +0100 Merge pull request modelica#2332 from beutlich/remove-Travis-CI Remove Travis CI As far as I understand this was no longer needed. commit 1a418d6 Merge: 7b62858 b2fa551 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 19 17:37:27 2019 +0100 Merge pull request modelica#2333 from sjoelund/add-parskip-etoolbox Add new texlive dependencies commit b2fa551 Author: Martin Sjölund <martin.sjolund@liu.se> Date: Tue Mar 19 17:28:45 2019 +0100 Add new texlive dependencies commit c62b47b Author: Thomas Beutlich <thomas.beutlich@esi-group.com> Date: Tue Mar 19 17:01:25 2019 +0100 refs modelica#2317: Remove Travis CI commit 1217a59 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 19 16:39:08 2019 +0100 Update .travis_install.sh And then parskip depend on etoolbox, so add that as well. commit c458feb Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Mon Mar 18 11:16:19 2019 +0100 Update .travis_install.sh Missing parskip commit 646c147 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 17:33:42 2019 +0100 Parskip no indent commit d4d32df Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 17:13:28 2019 +0100 Add comment commit d413e69 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 17:08:37 2019 +0100 Better Link commit 2f0fdd2 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 17:04:16 2019 +0100 Consisent function keywords commit 619879e Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 16:51:46 2019 +0100 Change section names commit 6d3cde9 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 16:51:34 2019 +0100 Introduce nonnormative commit 088d9cf Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Fri Mar 15 16:51:13 2019 +0100 Use Small font, not footnotesize commit 7b62858 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Mar 13 10:17:30 2019 +0100 Add link to MCP/0031 commit 8d60364 Merge: b4ee61b 6841c21 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 12 16:53:42 2019 +0100 Merge pull request modelica#2329 from modelica/StartSelectiveModelExtension Add Selective model extension. commit 6841c21 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Mar 12 16:17:21 2019 +0100 Add Selective model extension. commit b4ee61b Author: Martin Sjölund <martin.sjolund@liu.se> Date: Thu Mar 7 12:12:24 2019 +0100 [CI] Publish an index.html from the master branch commit a033603 Merge: 872d4ff 0574abb Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Thu Feb 28 14:05:09 2019 +0100 Merge pull request modelica#2325 from HansOlsson/ShortModelicaListings Changes for inline Modelica, and consistency for keywords. Preparing for update by @GallLeo commit 0574abb Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Thu Feb 28 13:51:18 2019 +0100 Previous commit was incorrect for within. commit beb3e3b Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Thu Feb 28 13:43:56 2019 +0100 Change name of production "annotation" to "annotation-comment" to avoid ambiguity with keyword "annotation". commit 6abc954 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Thu Feb 28 13:41:07 2019 +0100 Add constrainedby, each, expandable, operator as keywords. And within as keyword in grammar. commit bbdb054 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Thu Feb 28 13:34:49 2019 +0100 Add and use special variant for inline listings of Modelica. (Use as default, all long listings specify language.) commit 872d4ff Merge: a3b7ae8 04beabe Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Feb 27 13:37:38 2019 +0100 Merge pull request modelica#2324 from modelica/HansOlsson-patch-1 Update ReadMe.md to add link to MCP. commit 04beabe Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Wed Feb 27 13:26:02 2019 +0100 Update ReadMe.md Added link for units of literal constants. commit a3b7ae8 Merge: f9a2159 6044c47 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Tue Feb 26 09:45:28 2019 +0100 Merge pull request modelica#2323 from HansOlsson/FixCh2 Proper references, to enable hyperlinks. commit 6044c47 Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Mon Feb 25 17:05:29 2019 +0100 ProperReferences commit f9a2159 Merge: c85b2d6 f3ac47b Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Mon Feb 25 16:56:17 2019 +0100 Merge pull request modelica#2322 from HansOlsson/AddAutoScroll Automatically add scroll bar for navigation when needed. commit f3ac47b Author: OLSSON Hans <Hans.Olsson@3ds.com> Date: Mon Feb 25 16:20:52 2019 +0100 AutoScrollBar commit c85b2d6 Author: Francesco Casella <francesco.casella@polimi.it> Date: Thu Feb 14 19:53:46 2019 +0100 Changed 3.4 into 3.5 in the abstract commit 386adeb Author: Francesco Casella <francesco.casella@polimi.it> Date: Thu Feb 14 19:52:06 2019 +0100 Changed 3.4 to 3.5-dev in the title commit 9f926f1 Author: Martin Sjölund <martin.sjolund@liu.se> Date: Thu Feb 14 14:54:37 2019 +0100 Update links to master branch build commit 5bc5bc0 Author: Martin Sjölund <martin.sjolund@liu.se> Date: Thu Feb 14 09:50:35 2019 +0100 [CI] Build on Jenkins server commit 48a4255 Merge: 1da1aed a299d39 Author: Hans Olsson <HansOlsson@users.noreply.github.com> Date: Fri Feb 8 17:58:50 2019 +0100 Merge pull request modelica#2312 from beutlich/update-issue-links Update issue links commit a299d39 Author: Thomas Beutlich <thomas.beutlich@esi-group.com> Date: Wed Feb 6 08:43:14 2019 +0100 Update issue links
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use smaller font for normal listings, but not for inline ones.
To make existing listing more consistent: add all keywords, and change grammar so that it isn't "annotation: annotation modifier"